From Jon Smirl

support for usb host/endpoint lists

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21180 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/AUTHORS b/AUTHORS
index 8b01922a38f52c8096118834526b824ed8a5ce07..835410a98be364f82b7472e39ad5ba7a1b57fe8a 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -2612,7 +2612,7 @@ Martin Sustrik <sustrik [AT] imatix.com>  {
 }
 
 Jon Smirl <jonsmirl [AT] gmail.com> {
-       USB conversation list
+       USB conversations/endpoints list
 }
 
 and by:

diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index 598473c3298609b6d07ad818e8d460249a351cf9..a2d2992c61393259186bed2eab44df0aae1c4281 100644 (file)
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -162,6 +162,7 @@ WIRESHARK_TAP_SRC = \
        hostlist_tcpip.c \
        hostlist_tr.c   \
        hostlist_udpip.c \
+       hostlist_usb.c \
        hostlist_wlan.c \
        hostlist_rsvp.c \
        io_stat.c       \

diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c
index a4446fd29ee1b489b7ae077e6a5f3a8102de28ff..ef6e1c337d322e8c265aa263eeaf379cf1887ab7 100644 (file)
--- a/gtk/hostlist_table.c
+++ b/gtk/hostlist_table.c
@@ -130,6 +130,8 @@ hostlist_get_filter_name(address *addr, int specific_addr_type, int port_type, i
                             ;
                        }
                         break;
+               case AT_USB:
+                       return "usb.addr";
                default:
                        ;
                }

diff --git a/gtk/hostlist_usb.c b/gtk/hostlist_usb.c
new file mode 100755 (executable)
index 0000000..2425f38
--- /dev/null
+++ b/gtk/hostlist_usb.c
@@ -0,0 +1,92 @@
+/* hostlist_usb.c   2007 Jon Smirl
+ * modified from endpoint_talkers_eth.c   2003 Ronnie Sahlberg
+ *
+ * $Id$
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#include <gtk/gtk.h>
+#include <string.h>
+#include "epan/packet.h"
+#include <epan/stat_cmd_args.h>
+#include "../stat_menu.h"
+#include "gui_stat_menu.h"
+#include <epan/tap.h>
+#include <epan/emem.h>
+#include "../register.h"
+#include "hostlist_table.h"
+#include <epan/dissectors/packet-usb.h>
+
+
+static int
+usb_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_)
+{
+        hostlist_table *hosts=(hostlist_table *)pit;
+
+        /* Take two "add" passes per packet, adding for each direction, ensures that all
+        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, &pinfo->src, 0, TRUE, 1, pinfo->fd->pkt_len, SAT_NONE, PT_NONE);
+        add_hostlist_table_data(hosts, &pinfo->dst, 0, FALSE, 1, pinfo->fd->pkt_len, SAT_NONE, PT_NONE);
+
+        return 1;
+}
+
+static void
+gtk_usb_hostlist_init(const char *optarg, void* userdata _U_)
+{
+        const char *filter=NULL;
+
+        if (!strncmp(optarg, "hosts,usb," ,10)) {
+                filter = optarg + 10;
+        } else {
+                filter = NULL;
+        }
+
+        init_hostlist_table(TRUE, "USB Hosts", "usb", filter, usb_hostlist_packet);
+
+}
+
+
+static void
+gtk_usb_hostlist_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+        gtk_usb_hostlist_init("hosts,usb", NULL);
+}
+
+
+void
+register_tap_listener_usb_hostlist(void)
+{
+        register_stat_cmd_arg("hosts,usb", gtk_usb_hostlist_init, NULL);
+
+        register_stat_menu_item("USB", REGISTER_STAT_GROUP_ENDPOINT_LIST,
+            gtk_usb_hostlist_cb, NULL, NULL, NULL);
+
+        register_hostlist_table(TRUE, "USB", "usb", NULL /*filter*/, usb_hostlist_packet);
+}