diff options
| -rw-r--r-- | epan/dissectors/packet-usb.c | 17 | ||||
| -rw-r--r-- | epan/dissectors/packet-usb.h | 7 |
2 files changed, 16 insertions, 8 deletions
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index d116397ec4..edf2e01ea8 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -990,14 +990,15 @@ dissect_usb_device_descriptor(packet_info *pinfo _U_, proto_tree *parent_tree, usb_trans_info_t *usb_trans_info _U_, usb_conv_info_t *usb_conv_info _U_) { - proto_item *item = NULL; - proto_tree *tree = NULL; - proto_item *nitem = NULL; - int old_offset = offset; - guint32 protocol; - const gchar *description; - guint16 product_id, vendor_id; - guint32 product; + proto_item *item = NULL; + proto_tree *tree = NULL; + proto_item *nitem = NULL; + int old_offset = offset; + guint32 protocol; + const gchar *description; + guint16 vendor_id; + guint32 product; + guint16 product_id; if (parent_tree) { item = proto_tree_add_text(parent_tree, tvb, offset, -1, "DEVICE DESCRIPTOR"); diff --git a/epan/dissectors/packet-usb.h b/epan/dissectors/packet-usb.h index 29efb4435d..b7a6dbb9e3 100644 --- a/epan/dissectors/packet-usb.h +++ b/epan/dissectors/packet-usb.h @@ -89,6 +89,13 @@ typedef struct _usb_tap_data_t { usb_trans_info_t *trans_info; } usb_tap_data_t; +typedef struct _usb_data_t { + guint16 bus_id; + guint8 device_address; + guint8 endpoint; + gint direction; +} usb_data_t; + /* This is the endpoint number used for "no endpoint" or the fake endpoint * for the host side since we need two endpoints to manage conversations * properly. |