diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-02-19 14:45:21 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-02-19 22:46:10 +0000 |
commit | ddeab2c1deced6dca77f7b5ae224ed10e0ce7468 (patch) | |
tree | cffb05c02fbfe21e8abf7f4139351095acc1a9b4 | |
parent | eb9d2b00922c109c932eb339b2b2c92f04df06dd (diff) | |
download | wireshark-ddeab2c1deced6dca77f7b5ae224ed10e0ce7468.tar.gz |
Get rid of PCAP_ENCAP_USB.
It doesn't correspond to anything we support - and the old Linux USB
LINKTYPE_ value of 186 doesn't give enough information to dissect the
packets (it discards the event type, for example), so we drop the rest
of our support for it as well.
Change-Id: I6f537d9263174aba4320edf5140e1d1540e979c8
Reviewed-on: https://code.wireshark.org/review/14020
Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r-- | randpkt_core/randpkt_core.c | 8 | ||||
-rw-r--r-- | wiretap/pcap-common.c | 2 | ||||
-rw-r--r-- | wiretap/wtap.h | 2 |
3 files changed, 1 insertions, 11 deletions
diff --git a/randpkt_core/randpkt_core.c b/randpkt_core/randpkt_core.c index c329dc627d..c3b977e951 100644 --- a/randpkt_core/randpkt_core.c +++ b/randpkt_core/randpkt_core.c @@ -505,14 +505,6 @@ static randpkt_example examples[] = { 1000, }, - { "usb", "Universal Serial Bus", - PKT_USB, WTAP_ENCAP_USB, - NULL, 0, - NULL, 0, - NULL, NULL, - 1000, - }, - { "usb-linux", "Universal Serial Bus with Linux specific header", PKT_USB_LINUX, WTAP_ENCAP_USB_LINUX, NULL, 0, diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 470ec39ceb..99f1f2d34e 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -326,8 +326,6 @@ static const struct { { 181, WTAP_ENCAP_JUNIPER_CHDLC }, /* VOIP Frames prepended with meta-information */ { 183, WTAP_ENCAP_JUNIPER_VP }, - /* raw USB packets */ - { 186, WTAP_ENCAP_USB }, /* Bluetooth HCI UART transport (part H:4) frames, like hcidump */ { 187, WTAP_ENCAP_BLUETOOTH_H4 }, /* IEEE 802.16 MAC Common Part Sublayer */ diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 0b9dbcb620..1caf56fd47 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -178,7 +178,7 @@ extern "C" { #define WTAP_ENCAP_CATAPULT_DCT2000 89 #define WTAP_ENCAP_BER 90 #define WTAP_ENCAP_JUNIPER_VP 91 -#define WTAP_ENCAP_USB 92 +/* 92 is not used, feel free to resuse for another purpose */ #define WTAP_ENCAP_IEEE802_16_MAC_CPS 93 #define WTAP_ENCAP_NETTL_RAW_TELNET 94 #define WTAP_ENCAP_USB_LINUX 95 |