diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-28 14:47:28 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-29 09:57:24 +0000 |
| commit | 5d20997a35226fab09b87699fa7e6a30bf26ffd1 (patch) | |
| tree | dc532906db08b7831c11ea196bbdef196672f364 | |
| parent | fef89fc4cf5da5df6e07af22adcb1b24ac41048b (diff) | |
| download | wireshark-5d20997a35226fab09b87699fa7e6a30bf26ffd1.tar.gz | |
RSVP: copy all rsvp_request_key info in file scope
This is needed as it is later used for comparisons in the request hash table
Bug: 11793
Change-Id: I2ee1c894892c6ae88c4eac23237991b547a0983b
Reviewed-on: https://code.wireshark.org/review/12258
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-rsvp.c | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 5f6626f189..0384011b4b 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -7385,7 +7385,7 @@ dissect_rsvp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea break; } - SE_COPY_ADDRESS(&request_key.source_info.source, &rsvph->source); + COPY_ADDRESS_SHALLOW(&request_key.source_info.source, &rsvph->source); request_key.source_info.udp_source_port = rsvph->udp_source_port; /* See if a request with this key already exists */ @@ -7397,6 +7397,31 @@ dissect_rsvp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea if (!request_val) { new_request_key = (struct rsvp_request_key *)wmem_memdup( wmem_file_scope(), &request_key, sizeof(struct rsvp_request_key)); + switch (request_key.session_type) { + case RSVP_SESSION_TYPE_IPV4: + SE_COPY_ADDRESS(&new_request_key->u.session_ipv4.destination, + &request_key.u.session_ipv4.destination); + break; + case RSVP_SESSION_TYPE_IPV4_LSP: + SE_COPY_ADDRESS(&new_request_key->u.session_ipv4_lsp.destination, + &request_key.u.session_ipv4_lsp.destination); + break; + case RSVP_SESSION_TYPE_AGGREGATE_IPV4: + SE_COPY_ADDRESS(&new_request_key->u.session_agg_ipv4.destination, + &request_key.u.session_agg_ipv4.destination); + break; + case RSVP_SESSION_TYPE_IPV4_UNI: + SE_COPY_ADDRESS(&new_request_key->u.session_ipv4_uni.destination, + &request_key.u.session_ipv4_uni.destination); + break; + case RSVP_SESSION_TYPE_IPV4_E_NNI: + SE_COPY_ADDRESS(&new_request_key->u.session_ipv4_enni.destination, + &request_key.u.session_ipv4_enni.destination); + break; + default: + break; + } + SE_COPY_ADDRESS(&new_request_key->source_info.source, &rsvph->source); request_val = wmem_new(wmem_file_scope(), struct rsvp_request_val); request_val->value = conversation->index; |