diff options
| author | Lars Christensen <larsch@belunktum.dk> | 2018-06-24 11:08:12 +0000 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-06-25 14:19:31 +0000 |
| commit | dbba573f4d70c7160724ba98ba28e67a269cd88d (patch) | |
| tree | c498de0ba125bba9f8eeff6bc9f6d7851fc2868f /epan/dissectors/packet-usb.h | |
| parent | 336b56b3fce850ba8ac006a2509edbed4e3d440e (diff) | |
USB: Fall back to transfer type from descriptor
When dissecting USBIP packets, the transfer type is not known for every
packet like when dissecting usbmon captures. This patch lifs the
transfer type for the endpoint in the device descriptor and stores it in
the conversation. If the per-packet transfer type is unknown for a
transfer, it tries the one from the descriptor instead. This enables
bulk/iso payload dissectors to work on USBIP packets too.
Change-Id: If0a3e4f3b9598f586fa460d0d07032d22e203122
Reviewed-on: https://code.wireshark.org/review/28412
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-usb.h')
| -rw-r--r-- | epan/dissectors/packet-usb.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-usb.h b/epan/dissectors/packet-usb.h index 4a5155d9b5..9328539a2b 100644 --- a/epan/dissectors/packet-usb.h +++ b/epan/dissectors/packet-usb.h @@ -88,7 +88,8 @@ struct _usb_conv_info_t { guint16 device_address; guint8 endpoint; gint direction; - guint8 transfer_type; + guint8 transfer_type; /* transfer type from URB */ + guint8 descriptor_transfer_type; /* transfer type lifted from the device descriptor */ guint32 device_protocol; gboolean is_request; gboolean is_setup; |