aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-jxta.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-jxta.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-jxta.c')
-rw-r--r--epan/dissectors/packet-jxta.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c
index 9f11830899..9348995d07 100644
--- a/epan/dissectors/packet-jxta.c
+++ b/epan/dissectors/packet-jxta.c
@@ -746,18 +746,9 @@ Common_Exit:
**/
static jxta_stream_conversation_data *get_tpt_conversation(packet_info * pinfo)
{
- conversation_t *tpt_conversation =
- find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
+ conversation_t *tpt_conversation = find_or_create_conversation(pinfo);
jxta_stream_conversation_data *tpt_conv_data;
- if (tpt_conversation == NULL) {
- /*
- * No conversation exists yet - create one.
- */
- tpt_conversation =
- conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
- }
-
conversation_set_dissector(tpt_conversation, stream_jxta_handle);
tpt_conv_data = (jxta_stream_conversation_data *) conversation_get_proto_data(tpt_conversation, proto_jxta);