*
* $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
#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-udp.h"
+#include <epan/stat_cmd_args.h>
+#include <epan/tap.h>
+#include <epan/dissectors/packet-udp.h>
+
+#include "../stat_menu.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/hostlist_table.h"
static int
-udpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
+udpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
{
hostlist_table *hosts=(hostlist_table *)pit;
- e_udphdr *udphdr=vip;
+ const e_udphdr *udphdr=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, &udphdr->ip_src, udphdr->uh_sport, TRUE, 1, pinfo->fd->pkt_len, SAT_NONE, PT_UDP);
add_hostlist_table_data(hosts, &udphdr->ip_dst, udphdr->uh_dport, FALSE, 1, pinfo->fd->pkt_len, SAT_NONE, PT_UDP);
static void
-gtk_udpip_hostlist_init(char *optarg)
+gtk_udpip_hostlist_init(const char *optarg, void* userdata _U_)
{
- char *filter=NULL;
+ const char *filter=NULL;
if(!strncmp(optarg,"endpoints,udp,",14)){
filter=optarg+14;
filter=NULL;
}
- init_hostlist_table(FALSE, "UDP Endpoints", "udp", filter, (void *)udpip_hostlist_packet);
+ init_hostlist_table(FALSE, "UDP", "udp", filter, udpip_hostlist_packet);
}
static void
gtk_udpip_hostlist_cb(GtkWidget *w _U_, gpointer d _U_)
{
- gtk_udpip_hostlist_init("endpoints,udp");
+ gtk_udpip_hostlist_init("endpoints,udp",NULL);
}
void
register_tap_listener_udpip_hostlist(void)
{
- register_ethereal_tap("endpoints,udp", gtk_udpip_hostlist_init);
+ register_stat_cmd_arg("endpoints,udp", gtk_udpip_hostlist_init,NULL);
- register_tap_menu_item("UDP (IPv4 & IPv6)", REGISTER_TAP_GROUP_ENDPOINT_LIST,
+ register_stat_menu_item("UDP (IPv4 & IPv6)", REGISTER_STAT_GROUP_ENDPOINT_LIST,
gtk_udpip_hostlist_cb, NULL, NULL, NULL);
- register_hostlist_table(FALSE, "UDP", "udp", NULL /*filter*/, (void *)udpip_hostlist_packet);
+ register_hostlist_table(FALSE, "UDP", "udp", NULL /*filter*/, udpip_hostlist_packet);
}
-