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

remove usb_trans_info from dissect_usb_interface_descriptor()

Browse source 
Change-Id: Ia1bfdd705021e784213e00b70cfabc42b524384d
Reviewed-on: https://code.wireshark.org/review/3781
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
This commit is contained in:
Martin Kaiser 2014-08-20 13:58:21 +02:00
parent a87112fafc
commit 3313e2d67a
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1558,16 +1558,18 @@ dissect_usb_string_descriptor(packet_info *pinfo _U_, proto_tree *parent_tree,
static int
dissect_usb_interface_descriptor(packet_info *pinfo, proto_tree *parent_tree,
tvbuff_t *tvb, int offset,
usb_trans_info_t *usb_trans_info,
usb_conv_info_t *usb_conv_info)
{
proto_item *item;
proto_tree *tree;
const char *class_str = NULL;
int old_offset = offset;
guint8 len;
guint8 interface_num;
guint8 alt_setting;
proto_item *item;
proto_tree *tree;
const char *class_str = NULL;
int old_offset = offset;
guint8 len;
guint8 interface_num;
guint8 alt_setting;
usb_trans_info_t *usb_trans_info;
usb_trans_info = usb_conv_info->usb_trans_info;
tree = proto_tree_add_subtree(parent_tree, tvb, offset, -1, ett_descriptor_device, &item, "INTERFACE DESCRIPTOR");
@ -1988,7 +1990,7 @@ dissect_usb_configuration_descriptor(packet_info *pinfo _U_, proto_tree *parent_
next_type = tvb_get_guint8(tvb, offset+1);
switch(next_type) {
case USB_DT_INTERFACE:
offset = dissect_usb_interface_descriptor(pinfo, parent_tree, tvb, offset, usb_trans_info, usb_conv_info);
offset = dissect_usb_interface_descriptor(pinfo, parent_tree, tvb, offset, usb_conv_info);
break;
case USB_DT_ENDPOINT:
offset = dissect_usb_endpoint_descriptor(pinfo, parent_tree, tvb, offset, usb_trans_info, usb_conv_info);