aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-socks.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-10-28 09:58:28 -0400
committerMichael Mann <mmann78@netscape.net>2017-10-28 14:33:11 +0000
commit23afd9a18453c23cfbbc6a63f52b2e6e64e0056c (patch)
tree89fd4995a9148c1a7fad6c112faeb28a238fbbb5 /epan/dissectors/packet-socks.c
parent27c10ed72ea2451bfbb6c0eb50af4280e65a3fcf (diff)
Convert to using find_conversation_pinfo where appropriate
This makes it easier to identify the simpler/common conversations Change-Id: I7094f23e49156ee27f5f72c8e130308470f3e462 Reviewed-on: https://code.wireshark.org/review/24145 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-socks.c')
-rw-r--r--epan/dissectors/packet-socks.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c
index 1eba1e2c3c..7f4da5daaf 100644
--- a/epan/dissectors/packet-socks.c
+++ b/epan/dissectors/packet-socks.c
@@ -335,8 +335,7 @@ socks_udp_dissector(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d
proto_tree *socks_tree;
proto_item *ti;
- conversation = find_conversation( pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
- pinfo->srcport, pinfo->destport, 0);
+ conversation = find_conversation_pinfo( pinfo, 0);
DISSECTOR_ASSERT( conversation); /* should always find a conversation */
@@ -1003,8 +1002,7 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) {
if (state_info->in_socks_dissector_flag)
return 0;
- 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) {
/* If we don't already have a conversation, make sure the first
byte is a valid version number */