diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-01-20 05:40:56 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-01-20 05:40:56 +0000 |
| commit | 36e8efcbca4fdfdad9f24f7c3a8ae021d7b0823f (patch) | |
| tree | 743eafaabf72d89242cd8d582b90aeeabafcdea3 /wiretap | |
| parent | b8e743ada92143d984441ef493767bf4a8a78238 (diff) | |
| download | wireshark-36e8efcbca4fdfdad9f24f7c3a8ae021d7b0823f.tar.gz wireshark-36e8efcbca4fdfdad9f24f7c3a8ae021d7b0823f.tar.bz2 wireshark-36e8efcbca4fdfdad9f24f7c3a8ae021d7b0823f.zip | |
From Hannes Gredler: support for Juniper's DLT_JUNIPER_ATM{1,2} values.
svn path=/trunk/; revision=13130
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/libpcap.c | 6 | ||||
| -rw-r--r-- | wiretap/wtap.c | 6 | ||||
| -rw-r--r-- | wiretap/wtap.h | 4 |
3 files changed, 13 insertions, 3 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index f1052ffc0a..d5e5cb06f5 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -294,9 +294,11 @@ static const struct { { 129, WTAP_ENCAP_ARCNET_LINUX }, /* - * Values 130 through 137 are reserved for use in Juniper - * hardware. + * Values 130 through 137 not listed here are reserved for use + * in Juniper hardware. */ + { 135, WTAP_ENCAP_JUNIPER_ATM2 }, /* various encapsulations captured on the ATM2 PIC */ + { 137, WTAP_ENCAP_JUNIPER_ATM1 }, /* various encapsulations captured on the ATM1 PIC */ { 138, WTAP_ENCAP_APPLE_IP_OVER_IEEE1394 }, /* Apple IP-over-IEEE 1394 */ diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 6f7093bb61..d2841a4ef9 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -260,6 +260,12 @@ static const struct encap_type_info { /* WTAP_ENCAP_GPRS_LLC */ { "GPRS LLC", "gprs-llc" }, + + /* WTAP_ENCAP_JUNIPER_ATM1 */ + { "Juniper ATM1", "juniper-atm1" }, + + /* WTAP_ENCAP_JUNIPER_ATM2 */ + { "Juniper ATM2", "juniper-atm2" }, }; /* Name that should be somewhat descriptive. */ diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 04ebe77d95..6952ba1edc 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -156,9 +156,11 @@ #define WTAP_ENCAP_RAW_ICMP 64 #define WTAP_ENCAP_RAW_ICMPV6 65 #define WTAP_ENCAP_GPRS_LLC 67 +#define WTAP_ENCAP_JUNIPER_ATM1 68 +#define WTAP_ENCAP_JUNIPER_ATM2 69 /* last WTAP_ENCAP_ value + 1 */ -#define WTAP_NUM_ENCAP_TYPES 67 +#define WTAP_NUM_ENCAP_TYPES 70 /* File types that can be read by wiretap. We support writing some many of these file types, too, so we |