osmocom/wireshark
14
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

add the bus_id when we search for an existing conversation to our endpoint

Browse source 
(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>
This commit is contained in:
Martin Kaiser 2014-08-12 17:07:46 +02:00
parent 152c6b06f1
commit 797d28634f
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
epan/dissectors/packet-usb.c
View file

@ -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);