diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2014-08-28 20:56:00 +0200 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2014-08-28 19:05:57 +0000 |
| commit | 6603ac93914750b104d23e19ab30a14cf7ad263f (patch) | |
| tree | 80aba50c20dff7a79e8ac0f546b2166950624ec6 | |
| parent | 7312c07f8e01c60180aa5fb1203368cb90f0bf4d (diff) | |
correct detection of USB header type
this fixes a regression for linux USB headers without 64 bytes extension
Change-Id: Icb79d983dac6dca25d04657d3324286c73d31f29
Reviewed-on: https://code.wireshark.org/review/3906
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
| -rw-r--r-- | epan/dissectors/packet-usb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 125a7b9cd8..3564d401df 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -2797,7 +2797,8 @@ try_dissect_linux_usb_pseudo_header_ext(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint8 header_info) { - if (header_info & (USB_HEADER_IS_LINUX|USB_HEADER_IS_64_BYTES)) { + if ((header_info & USB_HEADER_IS_LINUX) && + (header_info & USB_HEADER_IS_64_BYTES)) { proto_tree_add_item(tree, hf_usb_urb_interval, tvb, offset, 4, ENC_HOST_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_usb_urb_start_frame, tvb, offset, 4, ENC_HOST_ENDIAN); |