some more : try to make read/write not break the build if the return value is not...

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

diff --git a/gtk/hostlist_ip.c b/gtk/hostlist_ip.c
index a16210c4110401c6a61c1b9496511cdb4304d6b9..523cef7a718a282cbf1101825ff190bfe0b939a3 100644 (file)
--- a/gtk/hostlist_ip.c
+++ b/gtk/hostlist_ip.c
@@ -1,10 +1,10 @@
 /* hostlist_ip.c   2004 Ian Schorr
  * modified from endpoint_talkers_ip.c   2003 Ronnie Sahlberg
  *
- * $Id: hostlist_ip.c,v 1.6 2004/05/02 21:16:08 ulfl 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
@@ -35,18 +35,20 @@
 #include <gtk/gtk.h>
 #include <string.h>
 #include "epan/packet.h"
-#include "tap_menu.h"
-#include "../tap.h"
+#include <epan/stat_cmd_args.h>
+#include "../stat_menu.h"
+#include "gui_stat_menu.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
-#include "packet-ip.h"
+#include <epan/dissectors/packet-ip.h>
 
 
 static int
-ip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
+ip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
        hostlist_table *hosts=(hostlist_table *)pit;
-       e_ip *iph=vip;
+       const e_ip *iph=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) 
@@ -57,9 +59,9 @@ ip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void
 }
 
 static void
-gtk_ip_hostlist_init(char *optarg)
+gtk_ip_hostlist_init(const char *optarg, void* userdata _U_)
 {
-       char *filter=NULL;
+       const char *filter=NULL;
 
        if(!strncmp(optarg,"hosts,ip,",9)){
                filter=optarg+9;
@@ -67,7 +69,7 @@ gtk_ip_hostlist_init(char *optarg)
                filter=NULL;
        }
 
-       init_hostlist_table(TRUE, "IPv4 Hosts", "ip", filter, (void *)ip_hostlist_packet);
+       init_hostlist_table(TRUE, "IPv4 Hosts", "ip", filter, ip_hostlist_packet);
 
 }
 
@@ -75,18 +77,17 @@ gtk_ip_hostlist_init(char *optarg)
 static void
 gtk_ip_hostlist_cb(GtkWidget *w _U_, gpointer d _U_)
 {
-       gtk_ip_hostlist_init("hosts,ip");
+       gtk_ip_hostlist_init("hosts,ip",NULL);
 }
 
 
 void
 register_tap_listener_ip_hostlist(void)
 {
-       register_ethereal_tap("hosts,ip", gtk_ip_hostlist_init);
+       register_stat_cmd_arg("hosts,ip", gtk_ip_hostlist_init,NULL);
 
-       register_tap_menu_item("IPv4", REGISTER_TAP_GROUP_ENDPOINT_LIST,
+       register_stat_menu_item("IPv4", REGISTER_STAT_GROUP_ENDPOINT_LIST,
                gtk_ip_hostlist_cb, NULL, NULL, NULL);
 
-       register_hostlist_table(TRUE, "IPv4", "ip", NULL /*filter*/, (void *)ip_hostlist_packet);
+       register_hostlist_table(TRUE, "IPv4", "ip", NULL /*filter*/, ip_hostlist_packet);
 }
-