diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-07-26 12:41:27 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-07-30 16:12:54 +0000 |
| commit | dcf6d44b7f5e69e08be8ccd452b87733326053cc (patch) | |
| tree | 8d68df38e6b5ed2c6caa5f2ccd6c1425eea95d90 /tshark.c | |
| parent | 54777bf31566e0e72e9204fd0d60bfbe8521d6c3 (diff) | |
| download | wireshark-dcf6d44b7f5e69e08be8ccd452b87733326053cc.tar.gz | |
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 <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'tshark.c')
| -rw-r--r-- | tshark.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -98,6 +98,7 @@ #endif #include "ui/util.h" #include "ui/ui_util.h" +#include "ui/cli/tshark-tap.h" #include "version_info.h" #include "register.h" #include <epan/epan_dissect.h> @@ -1199,7 +1200,7 @@ main(int argc, char *argv[]) register_all_plugin_tap_listeners(); #endif register_all_tap_listeners(); - conversation_table_set_gui_info(NULL); /* XXX - TODO: Provide "GUI" function for TShark */ + conversation_table_set_gui_info(init_iousers); /* If invoked with the "-G" flag, we dump out information based on the argument to the "-G" flag; if no argument is specified, |