summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-rsvp.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-rsvp.c')
-rw-r--r--epan/dissectors/packet-rsvp.c27
1 files changed, 26 insertions, 1 deletions
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c
index ed17ddb9eb..d1bcd6d164 100644
--- a/epan/dissectors/packet-rsvp.c
+++ b/epan/dissectors/packet-rsvp.c
@@ -7527,7 +7527,7 @@ dissect_rsvp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea
break;
}
- WMEM_COPY_ADDRESS(wmem_file_scope(), &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 */
@@ -7539,6 +7539,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:
+ WMEM_COPY_ADDRESS(wmem_file_scope(), &new_request_key->u.session_ipv4.destination,
+ &request_key.u.session_ipv4.destination);
+ break;
+ case RSVP_SESSION_TYPE_IPV4_LSP:
+ WMEM_COPY_ADDRESS(wmem_file_scope(), &new_request_key->u.session_ipv4_lsp.destination,
+ &request_key.u.session_ipv4_lsp.destination);
+ break;
+ case RSVP_SESSION_TYPE_AGGREGATE_IPV4:
+ WMEM_COPY_ADDRESS(wmem_file_scope(), &new_request_key->u.session_agg_ipv4.destination,
+ &request_key.u.session_agg_ipv4.destination);
+ break;
+ case RSVP_SESSION_TYPE_IPV4_UNI:
+ WMEM_COPY_ADDRESS(wmem_file_scope(), &new_request_key->u.session_ipv4_uni.destination,
+ &request_key.u.session_ipv4_uni.destination);
+ break;
+ case RSVP_SESSION_TYPE_IPV4_E_NNI:
+ WMEM_COPY_ADDRESS(wmem_file_scope(), &new_request_key->u.session_ipv4_enni.destination,
+ &request_key.u.session_ipv4_enni.destination);
+ break;
+ default:
+ break;
+ }
+ WMEM_COPY_ADDRESS(wmem_file_scope(), &new_request_key->source_info.source, &rsvph->source);
request_val = wmem_new(wmem_file_scope(), struct rsvp_request_val);
request_val->value = conversation->index;