aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ftp.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-ftp.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-ftp.c')
-rw-r--r--epan/dissectors/packet-ftp.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c
index 3056afd585..f8bf9d057a 100644
--- a/epan/dissectors/packet-ftp.c
+++ b/epan/dissectors/packet-ftp.c
@@ -1306,10 +1306,7 @@ dissect_ftpdata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
data_ti = proto_tree_add_item(tree, proto_ftp_data, tvb, 0, -1, ENC_NA);
/* Link back to setup of this stream */
- p_conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
- PT_TCP,
- pinfo->srcport, pinfo->destport,
- 0);
+ p_conv = find_conversation_pinfo(pinfo, 0);
if (p_conv) {
/* Link back to FTP frame where this conversation was created */