diff options
author | Michael Mann <mmann78@netscape.net> | 2014-07-23 13:38:55 -0400 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2014-07-26 20:59:42 +0000 |
commit | 31ecdf5b06bff3bb2e706e840c28c519698e6f67 (patch) | |
tree | 71b3e59889e862560412d317df71113f66b094b6 /ui/gtk/conversations_tr.c | |
parent | 507d07eda6ad562d4567cf0ee83aa9b03997beca (diff) |
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 'ui/gtk/conversations_tr.c')
-rw-r--r-- | ui/gtk/conversations_tr.c | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/ui/gtk/conversations_tr.c b/ui/gtk/conversations_tr.c deleted file mode 100644 index 0d0b975591..0000000000 --- a/ui/gtk/conversations_tr.c +++ /dev/null @@ -1,80 +0,0 @@ -/* conversations_tr.c - * conversations_tr 2003 Ronnie Sahlberg - * - * Wireshark - Network traffic analyzer - * By Gerald Combs <gerald@wireshark.org> - * Copyright 1998 Gerald Combs - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "config.h" - -#include <string.h> - -#include <gtk/gtk.h> - -#include <epan/packet.h> -#include <epan/stat_cmd_args.h> -#include <epan/tap.h> -#include <epan/dissectors/packet-tr.h> - -#include <epan/stat_groups.h> - -#include "ui/gtk/gui_stat_menu.h" -#include "ui/gtk/conversations_table.h" - -void register_tap_listener_tr_conversation(void); - -static int -tr_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) -{ - conversations_table *ct = (conversations_table *) pct; - const tr_hdr *trhdr=(const tr_hdr *)vip; - - add_conversation_table_data(&ct->hash, &trhdr->src, &trhdr->dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, CONV_TYPE_TOKEN_RING, PT_NONE); - - return 1; -} - - - -static void -tr_conversation_init(const char *opt_arg, void* userdata _U_) -{ - const char *filter=NULL; - - if(!strncmp(opt_arg,"conv,tr,",8)){ - filter=opt_arg+8; - } else { - filter=NULL; - } - - init_conversation_table(CONV_TYPE_TOKEN_RING, filter, tr_conversation_packet); - -} - -void -tr_conversation_cb(GtkAction *action _U_, gpointer user_data _U_) -{ - tr_conversation_init("conv,tr",NULL); -} - -void -register_tap_listener_tr_conversation(void) -{ - register_stat_cmd_arg("conv,tr", tr_conversation_init, NULL); - register_conversation_table(CONV_TYPE_TOKEN_RING, NULL /*filter*/, tr_conversation_packet); -} |