aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-usb.h
diff options
context:
space:
mode:
authorSean O. Stalley <sean.stalley@intel.com>2014-07-03 14:05:24 -0700
committerEvan Huus <eapache@gmail.com>2014-07-04 02:20:38 +0000
commitbbb3e2f7af074ca92eb0da9e438d919b251ed07e (patch)
tree9d2780eacdf4fc758d0181b405b8d89554e2e980 /epan/dissectors/packet-usb.h
parent212df87e7f3c91b36ff355bc6d4db845946d0c72 (diff)
Add Bus ID to USB Address Column
USB Addresses are now in the format of: bus_id.device_address.endpoint This makes it much easier to read traces that captured traffic on more than one bus. Change-Id: I264db2ceea712d94632d5d08d05d3af22a4a03fe Reviewed-on: https://code.wireshark.org/review/2833 Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-usb.h')
-rw-r--r--epan/dissectors/packet-usb.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-usb.h b/epan/dissectors/packet-usb.h
index ed9658dac2..40c9cd489b 100644
--- a/epan/dissectors/packet-usb.h
+++ b/epan/dissectors/packet-usb.h
@@ -29,6 +29,7 @@
typedef struct _usb_address_t {
guint32 device;
guint32 endpoint;
+ guint16 bus_id;
} usb_address_t;
#define USB_ADDR_LEN (sizeof(usb_address_t))
@@ -228,8 +229,8 @@ dissect_usb_setup_request(packet_info *pinfo, proto_tree *parent, tvbuff_t *tvb,
void
usb_set_addr(packet_info *pinfo, usb_address_t *src_addr,
- usb_address_t *dst_addr, guint16 device_address, int endpoint,
- gboolean req);
+ usb_address_t *dst_addr, guint16 bus_id, guint16 device_address,
+ int endpoint, gboolean req);
usb_trans_info_t
*usb_get_trans_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,