diff options
| author | Guy Harris <guy@alum.mit.edu> | 2011-12-22 09:22:35 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2011-12-22 09:22:35 +0000 |
| commit | 7962edcf56deba3c63bdb1ae5ef9a51d35cff97d (patch) | |
| tree | 5bbc4dcad1b5b56425222cb016a9b8fbb1e9328f | |
| parent | 678711f488961ff7623ff8b68969937fac033798 (diff) | |
| download | wireshark-7962edcf56deba3c63bdb1ae5ef9a51d35cff97d.tar.gz | |
The encapsulation following WTAP_ENCAP_ARCNET is
WTAP_ENCAP_ARCNET_LINUX; update various tables mapping Wiretap
encapsulations to file-type encapsulations. Get rid of some trailing
"sorry, that's not supported" entries while we're at it.
svn path=/trunk/; revision=40274
| -rw-r--r-- | wiretap/5views.c | 14 | ||||
| -rw-r--r-- | wiretap/netmon.c | 2 | ||||
| -rw-r--r-- | wiretap/ngsniffer.c | 1 | ||||
| -rw-r--r-- | wiretap/snoop.c | 2 |
4 files changed, 4 insertions, 15 deletions
diff --git a/wiretap/5views.c b/wiretap/5views.c index eb8879813d..98e9d325a3 100644 --- a/wiretap/5views.c +++ b/wiretap/5views.c @@ -356,19 +356,7 @@ typedef struct { static const int wtap_encap[] = { -1, /* WTAP_ENCAP_UNKNOWN -> unsupported */ - CST_5VW_CAPTURE_ETH_FILEID, /* WTAP_ENCAP_ETHERNET -> Ehernet Ethernet */ - -1, /* WTAP_ENCAP_TOKEN_RING -> unsupported */ - -1, /* WTAP_ENCAP_SLIP -> unsupported */ - -1, /* WTAP_ENCAP_PPP -> unsupported */ - -1, /* WTAP_ENCAP_FDDI -> unsupported */ - -1, /* WTAP_ENCAP_FDDI_BITSWAPPED -> unsupported */ - -1, /* WTAP_ENCAP_RAW_IP -> unsupported */ - -1, /* WTAP_ENCAP_ARCNET -> unsupported */ - -1, /* WTAP_ENCAP_ATM_RFC1483 -> unsupported */ - -1, /* WTAP_ENCAP_LINUX_ATM_CLIP -> unsupported */ - -1, /* WTAP_ENCAP_LAPB -> unsupported */ - -1, /* WTAP_ENCAP_ATM_PDUS -> unsupported */ - -1 /* WTAP_ENCAP_NULL -> unsupported */ + CST_5VW_CAPTURE_ETH_FILEID, /* WTAP_ENCAP_ETHERNET -> Ethernet */ }; #define NUM_WTAP_ENCAPS (sizeof wtap_encap / sizeof wtap_encap[0]) diff --git a/wiretap/netmon.c b/wiretap/netmon.c index ea57240f90..2c72384ae6 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -937,11 +937,11 @@ static const int wtap_encap[] = { 3, /* WTAP_ENCAP_FDDI_BITSWAPPED -> NDIS FDDI */ -1, /* WTAP_ENCAP_RAW_IP -> unsupported */ -1, /* WTAP_ENCAP_ARCNET -> unsupported */ + -1, /* WTAP_ENCAP_ARCNET_LINUX -> unsupported */ -1, /* WTAP_ENCAP_ATM_RFC1483 -> unsupported */ -1, /* WTAP_ENCAP_LINUX_ATM_CLIP -> unsupported */ -1, /* WTAP_ENCAP_LAPB -> unsupported*/ 4, /* WTAP_ENCAP_ATM_PDUS -> NDIS WAN (*NOT* ATM!) */ - -1 /* WTAP_ENCAP_NULL -> unsupported */ }; #define NUM_WTAP_ENCAPS (sizeof wtap_encap / sizeof wtap_encap[0]) diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index 4c0291fbd2..211ddbb90e 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -2026,6 +2026,7 @@ static const int wtap_encap[] = { 9, /* WTAP_ENCAP_FDDI_BITSWAPPED */ -1, /* WTAP_ENCAP_RAW_IP -> unsupported */ 2, /* WTAP_ENCAP_ARCNET */ + -1, /* WTAP_ENCAP_ARCNET_LINUX -> unsupported */ -1, /* WTAP_ENCAP_ATM_RFC1483 */ -1, /* WTAP_ENCAP_LINUX_ATM_CLIP */ 7, /* WTAP_ENCAP_LAPB -> Internetwork analyzer (synchronous) */ diff --git a/wiretap/snoop.c b/wiretap/snoop.c index 9df367a413..c284465ee1 100644 --- a/wiretap/snoop.c +++ b/wiretap/snoop.c @@ -873,11 +873,11 @@ static const int wtap_encap[] = { 0x08, /* WTAP_ENCAP_FDDI_BITSWAPPED -> DL_FDDI */ -1, /* WTAP_ENCAP_RAW_IP -> unsupported */ -1, /* WTAP_ENCAP_ARCNET -> unsupported */ + -1, /* WTAP_ENCAP_ARCNET_LINUX -> unsupported */ -1, /* WTAP_ENCAP_ATM_RFC1483 -> unsupported */ -1, /* WTAP_ENCAP_LINUX_ATM_CLIP -> unsupported */ -1, /* WTAP_ENCAP_LAPB -> unsupported*/ 0x12, /* WTAP_ENCAP_ATM_PDUS -> DL_IPATM */ - -1 /* WTAP_ENCAP_NULL -> unsupported */ }; #define NUM_WTAP_ENCAPS (sizeof wtap_encap / sizeof wtap_encap[0]) |