diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2014-08-12 17:07:46 +0200 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2014-08-13 21:03:52 +0000 |
| commit | 797d28634fc0958e79160b86c82ce98a51f3cf96 (patch) | |
| tree | 79dc3cd5b9ae160aab90d61feba25f2fde3ac5b9 | |
| parent | 152c6b06f1bb8193b6d2682ae40c61a1d642b7c1 (diff) | |
add the bus_id when we search for an existing conversation to our endpoint
(the existing code uses bus_id 0 by default and creates a new conversation)
Change-Id: I33a105bdf4218ac2dd21cf76825e972ff2dd1b9b
Reviewed-on: https://code.wireshark.org/review/3583
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
| -rw-r--r-- | epan/dissectors/packet-usb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index aa993ad756..5db6155228 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -1693,6 +1693,7 @@ dissect_usb_endpoint_descriptor(packet_info *pinfo, proto_tree *parent_tree, /* Create a new address structure that points to the same device * but the new endpoint. */ + usb_addr.bus_id = ((const usb_address_t *)(pinfo->src.data))->bus_id; usb_addr.device = ((const usb_address_t *)(pinfo->src.data))->device; usb_addr.endpoint = GUINT32_TO_LE(endpoint); SET_ADDRESS(&tmp_addr, AT_USB, USB_ADDR_LEN, (char *)&usb_addr); @@ -1704,6 +1705,7 @@ dissect_usb_endpoint_descriptor(packet_info *pinfo, proto_tree *parent_tree, /* Create a new address structure that points to the same device * but the new endpoint. */ + usb_addr.bus_id = ((const usb_address_t *)(pinfo->dst.data))->bus_id; usb_addr.device = ((const usb_address_t *)(pinfo->dst.data))->device; usb_addr.endpoint = GUINT32_TO_LE(endpoint); SET_ADDRESS(&tmp_addr, AT_USB, USB_ADDR_LEN, (char *)&usb_addr); |