aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2014-08-12 18:00:36 +0200
committerMartin Kaiser <wireshark@kaiser.cx>2014-08-13 21:04:08 +0000
commite21fbd1397451ce1158bec618f641b54a35db665 (patch)
treea812e4395b45e32b37034bfd7ce1fc1e06002aaa
parent797d28634fc0958e79160b86c82ce98a51f3cf96 (diff)
initialize bus_id and device
Change-Id: I18b6e17091c0f019535a0dc1734e60795339bb04 Reviewed-on: https://code.wireshark.org/review/3584 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
-rw-r--r--epan/dissectors/packet-usb.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c
index 5db6155228..cfddd88d4d 100644
--- a/epan/dissectors/packet-usb.c
+++ b/epan/dissectors/packet-usb.c
@@ -2587,11 +2587,15 @@ try_dissect_next_protocol(proto_tree *tree, proto_tree *parent, tvbuff_t *next_t
endpoint = usb_trans_info->setup.wIndex & 0x0f;
if (is_request) {
+ dst_addr.bus_id = usb_conv_info->bus_id;
+ dst_addr.device = usb_conv_info->device_address;
dst_addr.endpoint = dst_endpoint = GUINT32_TO_LE(endpoint);
SET_ADDRESS(&endpoint_addr, AT_USB, USB_ADDR_LEN, (char *)&dst_addr);
conversation = get_usb_conversation(pinfo, &pinfo->src, &endpoint_addr, pinfo->srcport, dst_endpoint);
} else {
+ src_addr.bus_id = usb_conv_info->bus_id;
+ src_addr.device = usb_conv_info->device_address;
src_addr.endpoint = src_endpoint = GUINT32_TO_LE(endpoint);
SET_ADDRESS(&endpoint_addr, AT_USB, USB_ADDR_LEN, (char *)&src_addr);