From Jon Smirl

support for USB conversations



svn path=/trunk/; revision=21179

3 files changed, 93 insertions, 0 deletions

diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index bec63ec528..598473c329 100644
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -137,6 +137,7 @@ WIRESHARK_TAP_SRC = \
 	conversations_tcpip.c	\
 	conversations_tr.c	\
 	conversations_udpip.c	\
+	conversations_usb.c	\
 	conversations_wlan.c	\
 	conversations_ncp.c     \
 	conversations_rsvp.c	\
diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c
index e7bf8110b0..d8cd900ac1 100644
--- a/gtk/conversations_table.c
+++ b/gtk/conversations_table.c
@@ -147,6 +147,8 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam
                             ;
 			}
                         break;
+		case AT_USB:
+			return "usb.sa";
 		default:
 			;
 		}
@@ -183,6 +185,8 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam
                             ;
 			}
                         break;
+		case AT_USB:
+			return "usb.da";
 		default:
 			;
 		}
@@ -219,6 +223,8 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam
                             ;
 			}
                         break;
+		case AT_USB:
+			return "usb.addr";
 		default:
 			;
 		}
diff --git a/gtk/conversations_usb.c b/gtk/conversations_usb.c
new file mode 100644
index 0000000000..e29689b28b
--- /dev/null
+++ b/gtk/conversations_usb.c
@@ -0,0 +1,86 @@
+/* conversations_usb.c 2007 Jon Smirl
+ * modified from conversations_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 "../register.h"
+#include "conversations_table.h"
+
+
+static int
+usb_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_)
+{
+	add_conversation_table_data((conversations_table *)pct, &pinfo->src, &pinfo->dst, 0, 0, 1, pinfo->fd->pkt_len, SAT_NONE, PT_NONE);
+
+	return 1;
+}
+
+
+
+static void
+usb_conversation_init(const char *optarg, void* userdata _U_)
+{
+	const char *filter=NULL;
+
+	if (!strncmp(optarg, "conv,usb,", 9)) {
+		filter = optarg + 9;
+	} else {
+		filter = NULL;
+	}
+
+	init_conversation_table(TRUE, "USB", "usb", filter, usb_conversation_packet);
+
+}
+
+
+static void
+usb_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+	usb_conversation_init("conv,usb", NULL);
+}
+
+
+void
+register_tap_listener_usb_conversation(void)
+{
+	register_stat_cmd_arg("conv,usb", usb_conversation_init, NULL);
+
+	register_stat_menu_item("USB", REGISTER_STAT_GROUP_CONVERSATION_LIST,
+	    usb_endpoints_cb, NULL, NULL, NULL);
+
+	register_conversation_table(TRUE, "USB", "usb", NULL /*filter*/, usb_conversation_packet);
+}