aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-fp_mux.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-fp_mux.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-fp_mux.c')
-rw-r--r--epan/dissectors/packet-fp_mux.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/epan/dissectors/packet-fp_mux.c b/epan/dissectors/packet-fp_mux.c
index 6be6b726f4..2caf1fb9e5 100644
--- a/epan/dissectors/packet-fp_mux.c
+++ b/epan/dissectors/packet-fp_mux.c
@@ -319,12 +319,7 @@ static int heur_dissect_fp_mux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
/* This is FP Mux! */
/* Set conversation dissector and dissect */
- conversation = find_conversation(pinfo->num, &pinfo->net_dst, &pinfo->net_src,
- pinfo->ptype, pinfo->destport, pinfo->srcport, 0);
- if (!conversation) {
- conversation = conversation_new(pinfo->num, &pinfo->net_dst, &pinfo->net_src,
- pinfo->ptype, pinfo->destport, pinfo->srcport, 0);
- }
+ conversation = find_or_create_conversation(pinfo);
conversation_set_dissector(conversation, fp_mux_handle);
dissect_fp_mux(tvb, pinfo, tree, data);