diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-12-07 17:54:08 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-12-07 17:54:08 +0000 |
| commit | 2f0198615974cb8bb7962b59dc9e7717fc8ff08e (patch) | |
| tree | b148a80e59fb9cd9a754745ccb95350a14ecb60e | |
| parent | 1bdc52af46ea7168b041c90e9245cd8b44370770 (diff) | |
Add an entry for the new DLT_GPRS_LLC (so that nobody working on
Ethereal, unaware that the Ethereal team does *NOT* control libpcap
format, thinks they can just grab 169 and use it for their own
purposes).
svn path=/trunk/; revision=12678
| -rw-r--r-- | wiretap/libpcap.c | 12 | ||||
| -rw-r--r-- | wiretap/wtap.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.h | 3 |
3 files changed, 17 insertions, 1 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index d36f7f2f1d..3f43115efe 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -336,6 +336,18 @@ static const struct { { 165, WTAP_ENCAP_BACNET_MS_TP }, /* + * 166 is reserved for a PPP variant in which the first byte + * of the 0xff03 header, the 0xff, is replaced by a direction + * byte. I don't know whether any captures look like that, + * but it is used for some Linux IP filtering (ipfilter?). + * + * 167 and 168 are reserved for more Juniper private-chassis- + * internal meta-information. + */ + + { 169, WTAP_ENCAP_GPRS_LLC }, + + /* * To repeat: * * If you need a new encapsulation type for libpcap files, do diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 8b0423eb09..6f7093bb61 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -257,6 +257,9 @@ static const struct encap_type_info { /* WTAP_ENCAP_RAW_ICMPV6 */ { "Raw ICMPv6", "raw-icmpv6" }, + + /* WTAP_ENCAP_GPRS_LLC */ + { "GPRS LLC", "gprs-llc" }, }; /* Name that should be somewhat descriptive. */ diff --git a/wiretap/wtap.h b/wiretap/wtap.h index c2157c717d..04ebe77d95 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -155,9 +155,10 @@ #define WTAP_ENCAP_BACNET_MS_TP 63 #define WTAP_ENCAP_RAW_ICMP 64 #define WTAP_ENCAP_RAW_ICMPV6 65 +#define WTAP_ENCAP_GPRS_LLC 67 /* last WTAP_ENCAP_ value + 1 */ -#define WTAP_NUM_ENCAP_TYPES 66 +#define WTAP_NUM_ENCAP_TYPES 67 /* File types that can be read by wiretap. We support writing some many of these file types, too, so we |