osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Martin Kaiser 2014-08-12 18:00:36 +02:00
parent 797d28634f
commit e21fbd1397
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-usb.c
View File

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