diff options
| author | Evan Huus <eapache@gmail.com> | 2013-03-07 23:57:43 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-03-07 23:57:43 +0000 |
| commit | c6c7efd1a7837780954e456bf97d4caec1fe3adb (patch) | |
| tree | 48a4804f8e9b49bb239cb3b86f2fda6309bf6f4b /epan/dissectors/packet-usb.h | |
| parent | 76fd64bd9f7bb63df13078d444b4030b4dd34a4d (diff) | |
From Max Baker via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8431
Add a few member variables to the USB conversation structure, necessary
for a USB PTP dissector.
svn path=/trunk/; revision=48184
Diffstat (limited to 'epan/dissectors/packet-usb.h')
| -rw-r--r-- | epan/dissectors/packet-usb.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/epan/dissectors/packet-usb.h b/epan/dissectors/packet-usb.h index d0b7b4e9ab..cd5c66ad6a 100644 --- a/epan/dissectors/packet-usb.h +++ b/epan/dissectors/packet-usb.h @@ -73,11 +73,15 @@ typedef struct _usb_trans_info_t { usb_conv_info_t *interface_info; } usb_trans_info_t; -/* there is one such structure for each device/endpoint conversation */ +/* Conversation Structure + * there is one such structure for each device/endpoint conversation */ struct _usb_conv_info_t { - guint16 interfaceClass; /* class for this conversation */ - guint16 interfaceSubclass; /* Most recent interface descriptor subclass */ - guint8 interfaceNum; /* Most recent interface number */ + guint16 interfaceClass; /* Interface Descriptor - class */ + guint16 interfaceSubclass; /* Interface Descriptor - subclass */ + guint16 interfaceProtocol; /* Interface Descriptor - protocol */ + guint8 interfaceNum; /* Most recent interface number */ + guint16 deviceVendor; /* Device Descriptor - USB Vendor ID */ + guint32 deviceProduct; /* Device Descriptor - USB Product ID - MSBs only for encoding unknown */ emem_tree_t *transactions; usb_trans_info_t *usb_trans_info; /* pointer to the current transaction */ void *class_data; /* private class/id decode data */ @@ -150,6 +154,9 @@ typedef struct _usb_data_t { #define IF_CLASS_UNKNOWN 0xffff #define IF_SUBCLASS_UNKNOWN 0xffff +#define IF_PROTOCOL_UNKNOWN 0xffff +#define DEV_VENDOR_UNKNOWN 0x0000 /* this id is unassigned */ +#define DEV_PRODUCT_UNKNOWN 0xfffffff /* 0x0000 and 0xffff are used values by vendors, so MSBs encode unknown */ /* bmRequestType values */ #define USB_DIR_OUT 0 /* to device */ |