diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-10-29 10:12:59 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-10-29 16:53:57 +0000 |
| commit | abfb6441177961fbdfa9648fdd2c40ef0ef3cefd (patch) | |
| tree | dc5d1b438a052e73ec243d2f10e772e39fec3894 /epan/dissectors/packet-icmpv6.c | |
| parent | 1bc6d4e96573f89ecdd719cb3cac92754b91f52c (diff) | |
Add conversation endpoint type
For the moment this mirrors the port_type enumeration (PT_XXX), but the
intent is to move away from using "port types", eliminating most (if not
all)
Added conversation_pt_to_endpoint_type() so that conversations deal with the
correct enumeration. This is for dissector that use pinfo->ptype as input
to conversation APIs. Explicit use of port types are converted to using
ENDPOINT_XXX type.
Change-Id: Ia0bf553a3943b702c921f185407e03ce93ebf0ef
Reviewed-on: https://code.wireshark.org/review/24166
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-icmpv6.c')
| -rw-r--r-- | epan/dissectors/packet-icmpv6.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index e8db91d18c..ad62e40d67 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -1377,11 +1377,11 @@ static conversation_t *_find_or_create_conversation(packet_info *pinfo) /* Have we seen this conversation before? */ conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, - pinfo->ptype, 0, 0, 0); + conversation_pt_to_endpoint_type(pinfo->ptype), 0, 0, 0); if (conv == NULL) { /* No, this is a new conversation. */ conv = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, - pinfo->ptype, 0, 0, 0); + conversation_pt_to_endpoint_type(pinfo->ptype), 0, 0, 0); } return conv; } @@ -1498,7 +1498,7 @@ static icmp_transaction_t *transaction_end(packet_info *pinfo, proto_tree *tree, double resp_time; conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, - pinfo->ptype, 0, 0, 0); + conversation_pt_to_endpoint_type(pinfo->ptype), 0, 0, 0); if (conversation == NULL) return NULL; |