aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/asn1/ros
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-10-29 10:12:59 -0400
committerMichael Mann <mmann78@netscape.net>2017-10-29 16:53:57 +0000
commitabfb6441177961fbdfa9648fdd2c40ef0ef3cefd (patch)
treedc5d1b438a052e73ec243d2f10e772e39fec3894 /epan/dissectors/asn1/ros
parent1bc6d4e96573f89ecdd719cb3cac92754b91f52c (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/asn1/ros')
-rw-r--r--epan/dissectors/asn1/ros/packet-ros-template.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/asn1/ros/packet-ros-template.c b/epan/dissectors/asn1/ros/packet-ros-template.c
index 1c0a46839e..89f59b88d0 100644
--- a/epan/dissectors/asn1/ros/packet-ros-template.c
+++ b/epan/dissectors/asn1/ros/packet-ros-template.c
@@ -278,9 +278,7 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui
conversation_t *conversation;
/* first see if we have already matched this */
- conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
- pinfo->ptype, pinfo->srcport,
- pinfo->destport, 0);
+ conversation = find_conversation_pinfo(pinfo, 0);
if (conversation == NULL)
return NULL;