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

reformat dissect_usb_setup_get_descriptor_response() 

Change-Id: I8004c4fd6e9cac3615d27b375229a79d01dfcd68
Reviewed-on: https://code.wireshark.org/review/3733
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
This commit is contained in:
Martin Kaiser 2014-08-19 15:40:45 +02:00
parent ea7a54926d
commit 74c8ded0d2
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2055,35 +2055,37 @@ dissect_usb_setup_get_descriptor_response(packet_info *pinfo, proto_tree *tree,
val_to_str_ext(usb_trans_info->u.get_descriptor.type, &std_descriptor_type_vals_ext, "Unknown type %u"));
switch(usb_trans_info->u.get_descriptor.type) {
case USB_DT_INTERFACE:
case USB_DT_ENDPOINT:
/* an interface or an endpoint descriptor can only be accessed
as part of a configuration descriptor */
break;
case USB_DT_DEVICE:
offset = dissect_usb_device_descriptor(pinfo, tree, tvb, offset, usb_conv_info);
break;
case USB_DT_CONFIG:
offset = dissect_usb_configuration_descriptor(pinfo, tree, tvb, offset, usb_conv_info);
break;
case USB_DT_STRING:
offset = dissect_usb_string_descriptor(pinfo, tree, tvb, offset, usb_conv_info);
break;
case USB_DT_DEVICE_QUALIFIER:
offset = dissect_usb_device_qualifier_descriptor(pinfo, tree, tvb, offset, usb_conv_info);
break;
case USB_DT_RPIPE:
if (usb_conv_info->interfaceClass == IF_CLASS_HID ||
usb_conv_info->interfaceClass == IF_CLASS_UNKNOWN) {
case USB_DT_INTERFACE:
case USB_DT_ENDPOINT:
/* an interface or an endpoint descriptor can only be accessed
as part of a configuration descriptor */
break;
case USB_DT_DEVICE:
offset = dissect_usb_device_descriptor(pinfo, tree, tvb, offset, usb_conv_info);
break;
case USB_DT_CONFIG:
offset = dissect_usb_configuration_descriptor(pinfo, tree, tvb, offset, usb_conv_info);
break;
case USB_DT_STRING:
offset = dissect_usb_string_descriptor(pinfo, tree, tvb, offset, usb_conv_info);
break;
case USB_DT_DEVICE_QUALIFIER:
offset = dissect_usb_device_qualifier_descriptor(pinfo, tree, tvb, offset, usb_conv_info);
break;
case USB_DT_RPIPE:
if (usb_conv_info->interfaceClass == IF_CLASS_HID ||
usb_conv_info->interfaceClass == IF_CLASS_UNKNOWN) {
offset = dissect_usb_hid_get_report_descriptor(pinfo, tree, tvb, offset, usb_conv_info);
break;
}
/* else fall through as default/unknown */
default:
/* XXX dissect the descriptor coming back from the device */
proto_tree_add_text(tree, tvb, offset, -1, "GET DESCRIPTOR data (unknown descriptor type %u)", usb_trans_info->u.get_descriptor.type);
offset = tvb_reported_length(tvb);
break;
}
/* else fall through as default/unknown */
default:
/* XXX dissect the descriptor coming back from the device */
proto_tree_add_text(tree, tvb, offset, -1,
"GET DESCRIPTOR data (unknown descriptor type %u)",
usb_trans_info->u.get_descriptor.type);
offset = tvb_reported_length(tvb);
break;
}
return offset;