merge_all_tap_menus() has been moved to menus.c.

[obnox/wireshark/wip.git] / gtk / hostlist_tcpip.c

diff --git a/gtk/hostlist_tcpip.c b/gtk/hostlist_tcpip.c
index 45106652e71cdddf3c9fbc60122159870a3c6532..0b0ca512994d3810d88b03e5e85eb2314091c2bf 100644 (file)
--- a/gtk/hostlist_tcpip.c
+++ b/gtk/hostlist_tcpip.c
@@ -1,10 +1,10 @@
 /* hostlist_tcpip.c   2004 Ian Schorr
  * modified from endpoint_talkers_tcpip.c   2003 Ronnie Sahlberg
  *
- * $Id: hostlist_tcpip.c,v 1.4 2004/02/23 05:35:47 guy Exp $
+ * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * 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
@@ -29,25 +29,28 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
+
 #include "epan/packet.h"
-#include "tap_menu.h"
-#include "../tap.h"
-#include "../register.h"
-#include "hostlist_table.h"
-#include "packet-tcp.h"
+#include <epan/stat_cmd_args.h>
+#include <epan/tap.h>
+#include <epan/dissectors/packet-tcp.h>
 
+#include "../stat_menu.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/hostlist_table.h"
 
 static int
-tcpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
+tcpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
        hostlist_table *hosts=(hostlist_table *)pit;
-       struct tcpheader *tcphdr=vip;
+       const struct tcpheader *tcphdr=vip;
 
        /* Take two "add" passes per packet, adding for each direction, ensures that all
-       packets are counted properly (even if address is sending to itself) 
+       packets are counted properly (even if address is sending to itself)
        XXX - this could probably be done more efficiently inside hostlist_table */
        add_hostlist_table_data(hosts, &tcphdr->ip_src, tcphdr->th_sport, TRUE, 1, pinfo->fd->pkt_len, SAT_NONE, PT_TCP);
        add_hostlist_table_data(hosts, &tcphdr->ip_dst, tcphdr->th_dport, FALSE, 1, pinfo->fd->pkt_len, SAT_NONE, PT_TCP);
@@ -58,9 +61,9 @@ tcpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, vo
 
 
 static void
-gtk_tcpip_hostlist_init(char *optarg)
+gtk_tcpip_hostlist_init(const char *optarg, void* userdata _U_)
 {
-       char *filter=NULL;
+       const char *filter=NULL;
 
        if(!strncmp(optarg,"endpoints,tcp,",14)){
                filter=optarg+14;
@@ -68,24 +71,33 @@ gtk_tcpip_hostlist_init(char *optarg)
                filter=NULL;
        }
 
-       init_hostlist_table(FALSE, "TCP Endpoints", "tcp", filter, (void *)tcpip_hostlist_packet);
+       init_hostlist_table(FALSE, "TCP", "tcp", filter, tcpip_hostlist_packet);
 
 }
 
-
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+gtk_tcpip_hostlist_cb(GtkAction *action _U_, gpointer user_data _U_)
+{
+       gtk_tcpip_hostlist_init("endpoints,tcp",NULL);
+}
+#else
 static void
 gtk_tcpip_hostlist_cb(GtkWidget *w _U_, gpointer d _U_)
 {
-       gtk_tcpip_hostlist_init("endpoints,tcp");
+       gtk_tcpip_hostlist_init("endpoints,tcp",NULL);
 }
-
+#endif
 
 void
 register_tap_listener_tcpip_hostlist(void)
 {
-       register_ethereal_tap("endpoints,tcp", gtk_tcpip_hostlist_init);
+       register_stat_cmd_arg("endpoints,tcp", gtk_tcpip_hostlist_init,NULL);
 
-       register_tap_menu_item("TCP/Endpoint List (IPv4 & IPv6)", REGISTER_TAP_LAYER_TRANSPORT,
+#ifdef MAIN_MENU_USE_UIMANAGER
+#else
+       register_stat_menu_item("TCP (IPv4 & IPv6)", REGISTER_STAT_GROUP_ENDPOINT_LIST,
            gtk_tcpip_hostlist_cb, NULL, NULL, NULL);
+#endif
+       register_hostlist_table(FALSE, "TCP", "tcp", NULL /*filter*/, tcpip_hostlist_packet);
 }
-