diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-03-21 08:40:19 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-03-21 08:40:19 +0000 |
| commit | b971f1b1a0f926cdcb0513d0c04a96e2dbbc3736 (patch) | |
| tree | a137a9dc0636d9517129897539e5f447d0d35110 /epan/dissectors/packet-usb-hid.c | |
| parent | 254e20855820d26144f5575bb2171500c106bb4c (diff) | |
From Steve Magnani:
USB: incorrect generated bInterfaceClass for composite device CONTROL transactions.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6964
svn path=/trunk/; revision=41715
Diffstat (limited to 'epan/dissectors/packet-usb-hid.c')
| -rw-r--r-- | epan/dissectors/packet-usb-hid.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c index 59fb47b616..df6d1194b6 100644 --- a/epan/dissectors/packet-usb-hid.c +++ b/epan/dissectors/packet-usb-hid.c @@ -768,10 +768,10 @@ dissect_usb_hid_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissector = NULL; /* Check valid values for bmRequestType. See Chapter 7.2 in USBHID 1.11 */ - if ((usb_trans_info->requesttype & 0x7F) == + if ((usb_trans_info->setup.requesttype & 0x7F) == ((RQT_SETUP_TYPE_CLASS << 5) | RQT_SETUP_RECIPIENT_INTERFACE)) { for (tmp = setup_dissectors; tmp->dissector; tmp++) { - if (tmp->request == usb_trans_info->request) { + if (tmp->request == usb_trans_info->setup.request) { dissector = tmp->dissector; break; } @@ -788,7 +788,7 @@ dissect_usb_hid_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s", - val_to_str(usb_trans_info->request, setup_request_names_vals, "Unknown type %x"), + val_to_str(usb_trans_info->setup.request, setup_request_names_vals, "Unknown type %x"), is_request ? "Request" : "Response"); } |