diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2014-04-13 20:31:57 +0200 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2014-06-02 15:19:46 +0000 |
| commit | 1ca8d5f33f90aba6d5e3b752cd215c4d65849a80 (patch) | |
| tree | 5c0f07034bf1483cd6d192a1208bfcca456310a9 | |
| parent | 090f568e6a8e8d0b44152f9aef3f57a6e6a5b1df (diff) | |
use bus_id from the conversation struct
Change-Id: I796138bab6d4b75ade047f0706e68f301e4559df
Reviewed-on: https://code.wireshark.org/review/1919
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
| -rw-r--r-- | epan/dissectors/packet-usb.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index f241641c7a..d8335f679c 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -3308,7 +3308,7 @@ dissect_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, k_frame_number = pinfo->fd->num; k_device_address = device_address; - k_bus_id = bus_id; + k_bus_id = usb_conv_info->bus_id; key[0].length = 1; key[0].key = &k_device_address; @@ -3320,7 +3320,7 @@ dissect_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, key[3].key = NULL; device_product_data = (device_product_data_t *) wmem_tree_lookup32_array_le(device_to_product_table, key); - if (device_product_data && device_product_data->bus_id == bus_id && + if (device_product_data && device_product_data->bus_id == usb_conv_info->bus_id && device_product_data->device_address == device_address) { p_add_proto_data(pinfo->pool, pinfo, proto_usb, USB_VENDOR_ID, GUINT_TO_POINTER((guint)device_product_data->vendor)); p_add_proto_data(pinfo->pool, pinfo, proto_usb, USB_PRODUCT_ID, GUINT_TO_POINTER((guint)device_product_data->product)); @@ -3329,7 +3329,7 @@ dissect_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, } device_protocol_data = (device_protocol_data_t *) wmem_tree_lookup32_array_le(device_to_protocol_table, key); - if (device_protocol_data && device_protocol_data->bus_id == bus_id && + if (device_protocol_data && device_protocol_data->bus_id == usb_conv_info->bus_id && device_protocol_data->device_address == device_address) { p_add_proto_data(pinfo->pool, pinfo, proto_usb, USB_DEVICE_CLASS, GUINT_TO_POINTER(device_protocol_data->protocol >> 16)); p_add_proto_data(pinfo->pool, pinfo, proto_usb, USB_DEVICE_SUBCLASS, GUINT_TO_POINTER((device_protocol_data->protocol >> 8) & 0xFF)); @@ -3339,7 +3339,8 @@ dissect_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, device_protocol_data = NULL; } - p_add_proto_data(pinfo->pool, pinfo, proto_usb, USB_BUS_ID, GUINT_TO_POINTER(bus_id)); + p_add_proto_data(pinfo->pool, pinfo, proto_usb, USB_BUS_ID, + GUINT_TO_POINTER(usb_conv_info->bus_id)); p_add_proto_data(pinfo->pool, pinfo, proto_usb, USB_DEVICE_ADDRESS, GUINT_TO_POINTER((guint)device_address)); if (tvb_length_remaining(tvb, offset) > 0) { |