aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-usb.h
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2016-01-31 03:07:45 +0100
committerPascal Quantin <pascal.quantin@gmail.com>2016-02-16 18:52:49 +0000
commit360349c002418281ce4f8d5e5b538c30bb6fd057 (patch)
tree19ddbb65d8ffe9b401c419fde3ee86a0e078e3e0 /epan/dissectors/packet-usb.h
parent878d724c528d1a33b511e8493607ad2ccbad5019 (diff)
USBIP: add USBIP Protocol dissector
This patch adds support for the USBIP protocol [0]. A document describing the protocol in detail is available from the linux kernel source [1]. The USBIP protocol mimics a USB HCD on a client PC that tunnels USB data over TCP/IP between the client and the host where the physical USB device is connected. A testcase has been submitted to bug.wireshark.org [2]. [0] <http://usbip.sourceforge.net/> [1] <https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/drivers/usb/usbip/usbip_protocol.txt> [2] <https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12127> Bug: 12127 Change-Id: I4e557dc274017eb029c7af2717a62be4b00aebda Reviewed-on: https://code.wireshark.org/review/13797 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-usb.h')
-rw-r--r--epan/dissectors/packet-usb.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/epan/dissectors/packet-usb.h b/epan/dissectors/packet-usb.h
index 0dfd3f2779..c12d5d0e03 100644
--- a/epan/dissectors/packet-usb.h
+++ b/epan/dissectors/packet-usb.h
@@ -46,7 +46,8 @@ typedef enum {
USB_HEADER_LINUX_48_BYTES,
USB_HEADER_LINUX_64_BYTES,
USB_HEADER_USBPCAP,
- USB_HEADER_MAUSB
+ USB_HEADER_MAUSB,
+ USB_HEADER_USBIP
} usb_header_t;
#define USB_HEADER_IS_LINUX(type) \
@@ -226,6 +227,10 @@ typedef struct _usb_tap_data_t {
/* 9.6.6 */
extern const true_false_string tfs_endpoint_direction;
+extern value_string_ext usb_class_vals_ext;
+
+extern value_string_ext usb_urb_status_vals_ext;
+
usb_conv_info_t *get_usb_iface_conv_info(packet_info *pinfo, guint8 interface_num);
proto_item * dissect_usb_descriptor_header(proto_tree *tree,
@@ -248,7 +253,7 @@ struct mausb_header;
void
dissect_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent,
- usb_header_t header_type, struct mausb_header *ma_header);
+ usb_header_t header_type, void *extra_data);
#endif