diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-06-21 19:01:37 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-06-22 02:02:18 +0000 |
| commit | a9c2697714b8053b2cd9b1e1e0f07baf9d345c1f (patch) | |
| tree | 73e1dc8fb13ead82ad08ad066062ad9890895c47 | |
| parent | e46cb2defc559a530d11689d50f0adf47513e8e5 (diff) | |
| download | wireshark-a9c2697714b8053b2cd9b1e1e0f07baf9d345c1f.tar.gz | |
Add WTAP_ENCAP_3MB_ETHERNET for Xerox 3MB Ethernet.
It needed to be done:
https://github.com/shirriff/pup-wireshark
(And, yes, there really *is* a DLT_/LINKTYPE_ for it! The original DLT_
values were ARP hardware types, and 3MB Ethernet was assigned an ARP
hardware type of 2.)
Change-Id: I60d96c28e67854adcb28c7e3579ae5dd1f07df4b
Reviewed-on: https://code.wireshark.org/review/22336
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | wiretap/pcap-common.c | 1 | ||||
| -rw-r--r-- | wiretap/wtap.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.h | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index d615411b76..0c7a36f31a 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -105,6 +105,7 @@ static const struct { */ { 0, WTAP_ENCAP_NULL }, /* null encapsulation */ { 1, WTAP_ENCAP_ETHERNET }, + { 2, WTAP_ENCAP_3MB_ETHERNET }, { 3, WTAP_ENCAP_AX25 }, { 6, WTAP_ENCAP_TOKEN_RING }, /* IEEE 802 Networks - assume token ring */ { 7, WTAP_ENCAP_ARCNET }, diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 2fc3303a1f..848ded06a1 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -923,6 +923,9 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_LORATAP */ { "LoRaTap", "loratap"}, + + /* WTAP_ENCAP_3MB_ETHERNET */ + { "Xerox 3MB Ethernet", "xeth"}, }; WS_DLL_LOCAL diff --git a/wiretap/wtap.h b/wiretap/wtap.h index b4309903ac..c05936fbec 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -271,6 +271,7 @@ extern "C" { #define WTAP_ENCAP_JUNIPER_VN 181 #define WTAP_ENCAP_USB_DARWIN 182 #define WTAP_ENCAP_LORATAP 183 +#define WTAP_ENCAP_3MB_ETHERNET 184 /* After adding new item here, please also add new item to encap_table_base array */ #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |