diff options
| author | Tomasz Moń <desowin@gmail.com> | 2019-07-23 15:54:36 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-07-25 08:56:18 +0000 |
| commit | 53fdec477da233d7161990616f174deedad524b8 (patch) | |
| tree | 7f9ce39d3caeb43c016da71963ed19612a7834dd /wiretap | |
| parent | d55cf134eb1b13c5377cffeaf019ca0464722a7b (diff) | |
USBLL: Initial USB 2.0 Link Layer dissector
Dissect raw USB Packets. The actual USB packets to transaction conversion
(which is needed to pass the data to existing USB URB dissector) is not
implemented yet.
Ping-Bug: 15908
Change-Id: Ia75d58882d770fdd8650622d318241743069ad8f
Reviewed-on: https://code.wireshark.org/review/34006
Reviewed-by: Tomasz Moń <desowin@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.c | 2 | ||||
| -rw-r--r-- | wiretap/wtap.h | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 48ea4e00d9..e4289be742 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -472,6 +472,9 @@ static const struct { /* IEEE 802.15.4 TAP */ { 283, WTAP_ENCAP_IEEE802_15_4_TAP }, + + /* USB 2.0/1.1/1.0 packets as transmitted over the cable */ + { 288, WTAP_ENCAP_USB_2_0 }, /* * To repeat: * diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 3bb8934574..b4470c8d4e 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -975,6 +975,8 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_LOG_3GPP */ { "log_3GPP", "3GPP Phone Log" }, + /* WTAP_ENCAP_USB_2_0 */ + { "usb-20", "USB 2.0/1.1/1.0 packets" }, }; WS_DLL_LOCAL diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 6d8077542d..5c2f3cc262 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -288,6 +288,7 @@ extern "C" { #define WTAP_ENCAP_VPP 205 #define WTAP_ENCAP_IEEE802_15_4_TAP 206 #define WTAP_ENCAP_LOG_3GPP 207 +#define WTAP_ENCAP_USB_2_0 208 /* After adding new item here, please also add new item to encap_table_base array */ |