summaryrefslogtreecommitdiff
path: root/ui/gtk/conversations_jxta.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 /ui/gtk/conversations_jxta.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 'ui/gtk/conversations_jxta.c')
-rw-r--r--ui/gtk/conversations_jxta.c89
1 files changed, 0 insertions, 89 deletions
diff --git a/ui/gtk/conversations_jxta.c b/ui/gtk/conversations_jxta.c
deleted file mode 100644
index 472a3207a5..0000000000
--- a/ui/gtk/conversations_jxta.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* conversations_jxta.c
- * conversations_jxta copyright (c) 2005 Mike Duigou <bondolo@jxta.org>
- * copied from conversations_sctp.c
- *
- * 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-jxta.h>
-
-#include <epan/stat_groups.h>
-
-#include "ui/gtk/gui_stat_menu.h"
-#include "ui/gtk/conversations_table.h"
-
-void register_tap_listener_jxta_conversation(void);
-
-static int
-jxta_conversation_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip)
-{
- conversations_table *ct = (conversations_table *) pct;
- const jxta_tap_header *jxtahdr = (const jxta_tap_header *) vip;
-
- add_conversation_table_data(&ct->hash,
- &jxtahdr->src_address,
- &jxtahdr->dest_address,
- 0,
- 0,
- 1,
- jxtahdr->size,
- NULL,
- CONV_TYPE_JXTA,
- PT_NONE);
-
-
- return 1;
-}
-
-static void
-jxta_conversation_init(const char *opt_arg, void* userdata _U_)
-{
- const char *filter=NULL;
-
- if(!strncmp(opt_arg,"conv,jxta,",10)){
- filter=opt_arg+10;
- } else {
- filter=NULL;
- }
-
- init_conversation_table(CONV_TYPE_JXTA, filter, jxta_conversation_packet);
-
-}
-
-void
-jxta_conversation_cb(GtkAction *action _U_, gpointer user_data _U_)
-{
- jxta_conversation_init("conv,jxta",NULL);
-}
-
-void
-register_tap_listener_jxta_conversation(void)
-{
- register_stat_cmd_arg("conv,jxta", jxta_conversation_init,NULL);
- register_conversation_table(CONV_TYPE_JXTA, NULL /*filter*/, jxta_conversation_packet);
-}