summaryrefslogtreecommitdiff
path: root/tshark.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2014-07-23 13:38:55 -0400
committerGerald Combs <gerald@wireshark.org>2014-07-26 20:59:42 +0000
commit31ecdf5b06bff3bb2e706e840c28c519698e6f67 (patch)
tree71b3e59889e862560412d317df71113f66b094b6 /tshark.c
parent507d07eda6ad562d4567cf0ee83aa9b03997beca (diff)
downloadwireshark-31ecdf5b06bff3bb2e706e840c28c519698e6f67.tar.gz
Refactor "common" Conversation table functionality.
Refactor (non-GUI) conversation table functionality from gtk/Qt to epan. Also refactor "common GUI" conversation table functionality. The idea is to not have to modify the GUI when a dissector adds a new "conversation type" Change-Id: I11f08d0d7edd631218663ba4b902c4a4c849acda Reviewed-on: https://code.wireshark.org/review/3113 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'tshark.c')
-rw-r--r--tshark.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tshark.c b/tshark.c
index dcd30b930d..e37e4cf04a 100644
--- a/tshark.c
+++ b/tshark.c
@@ -104,6 +104,7 @@
#include <epan/tap.h>
#include <epan/stat_cmd_args.h>
#include <epan/timestamp.h>
+#include <epan/conversation_table.h>
#include <epan/ex-opt.h>
#include "capture_opts.h"
@@ -1198,6 +1199,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 */
/* If invoked with the "-G" flag, we dump out information based on
the argument to the "-G" flag; if no argument is specified,