diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-05-01 12:55:23 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-05-01 20:16:15 +0000 |
| commit | 2cb5985bf47bdc8bea78d28483ed224abdd33dc6 (patch) | |
| tree | a9e4e5035f4cbc41ad0ba22fad778b4f2e1ef05f /epan/dissectors/packet-usb.h | |
| parent | 7c79da8c30e39aecb1cddab39f537d8f6a1da25f (diff) | |
Make class "type" for USB conversations.
USB dissectors can't assume that only their class type has been passed around in the conversation. Make explicit check that class type expected matches the dissector and stop/prevent dissection if there isn't a match.
Bug: 12356
Change-Id: Ib23973a4ebd0fbb51952ffc118daf95e3389a209
Reviewed-on: https://code.wireshark.org/review/15212
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-usb.h')
| -rw-r--r-- | epan/dissectors/packet-usb.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/epan/dissectors/packet-usb.h b/epan/dissectors/packet-usb.h index 20ecc80b04..261592db5d 100644 --- a/epan/dissectors/packet-usb.h +++ b/epan/dissectors/packet-usb.h @@ -90,6 +90,8 @@ typedef struct _usb_trans_info_t { guint64 usb_id; } usb_trans_info_t; +enum usb_conv_class_data_type {USB_CONV_UNKNOWN = 0, USB_CONV_U3V, USB_CONV_AUDIO, USB_CONV_VIDEO, USB_CONV_MASS_STORAGE}; + /* Conversation Structure * there is one such structure for each device/endpoint conversation */ struct _usb_conv_info_t { @@ -113,7 +115,8 @@ struct _usb_conv_info_t { wmem_tree_t *transactions; usb_trans_info_t *usb_trans_info; /* pointer to the current transaction */ - void *class_data; /* private class/id decode data */ + void *class_data; /* private class/id decode data */ + enum usb_conv_class_data_type class_data_type; wmem_array_t *alt_settings; }; |