From dcf6d44b7f5e69e08be8ccd452b87733326053cc Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sat, 26 Jul 2014 12:41:27 -0400 Subject: Apply refactored "conversation" (tap) data to TShark. I intentionally left the fields displayed alone (so they don't exactly match Wireshark GUI), because as Guy points out in bug 6310, not sure its A Bug or A Feature. But at least all types of conversations allowed are in sync with Wireshark GUI. Bug:6310 Change-Id: I722837df510a39dadc1f9a07a99275509516698c Reviewed-on: https://code.wireshark.org/review/3212 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-jxta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'epan/dissectors/packet-jxta.c') diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index bc39290d59..3cefa18000 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -218,7 +218,7 @@ jxta_conversation_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt const jxta_tap_header *jxtahdr = (const jxta_tap_header *) vip; add_conversation_table_data(hash, &jxtahdr->src_address, &jxtahdr->dest_address, - 0, 0, 1, jxtahdr->size, NULL, &jxta_ct_dissector_info, PT_NONE); + 0, 0, 1, jxtahdr->size, NULL, NULL, &jxta_ct_dissector_info, PT_NONE); return 1; } -- cgit v1.2.3