summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2015-02-07 19:58:40 +0100
committerMartin Kaiser <wireshark@kaiser.cx>2015-02-07 18:59:40 +0000
commit4282304a57e67a1698684d87f70dd45480d795c8 (patch)
treea30543b69a612dd38cbdfcf1e175b22d42500375
parent5457865be3c4b1b4f668b1e0875a4097c66a0d02 (diff)
downloadwireshark-4282304a57e67a1698684d87f70dd45480d795c8.tar.gz
set protocol to USBHID for get descriptor request and response
if they're dealing with HID descriptors Change-Id: Ia529fe373653ddf18e05e8ad148a2f5b5686fa95 Reviewed-on: https://code.wireshark.org/review/7010 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-rw-r--r--epan/dissectors/packet-usb-hid.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c
index d18058b189..41bf1e61c8 100644
--- a/epan/dissectors/packet-usb-hid.c
+++ b/epan/dissectors/packet-usb-hid.c
@@ -1331,6 +1331,8 @@ dissect_usb_hid_control_std_intf(tvbuff_t *tvb, packet_info *pinfo,
/* XXX - can we do some plausibility checks here? */
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBHID");
+
/* we can't use usb_conv_info->is_request since usb_conv_info
was replaced with the interface conversation */
if (usb_trans_info->request_in == pinfo->fd->num) {