diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-07-22 15:55:06 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-07-22 15:55:06 +0000 |
| commit | bd12fbef7fd07f1f858e9314419486899e4d54aa (patch) | |
| tree | 928e581edaf333bc08ddde006d48368ecfa3782b /wiretap | |
| parent | 5800e255efcd72aaa92031bd3936895a2a0fefc0 (diff) | |
From Hannes Gredler:
support for support for DLT_JUNIPER_MLPPP
svn path=/trunk/; revision=14994
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/libpcap.c | 4 | ||||
| -rw-r--r-- | wiretap/wtap.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.h | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 97c14fcf78..b6136d2398 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -307,9 +307,9 @@ static const struct { { 127, WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP }, /* 802.11 plus radiotap WLAN header */ { 128, WTAP_ENCAP_TZSP }, /* Tazmen Sniffer Protocol */ { 129, WTAP_ENCAP_ARCNET_LINUX }, - + { 130, WTAP_ENCAP_JUNIPER_MLPPP }, /* Juniper MLPPP on ML-, LS-, AS- PICs */ /* - * Values 130 through 137 not listed here are reserved for use + * Values 131-134, 136 not listed here are reserved for use * in Juniper hardware. */ { 135, WTAP_ENCAP_JUNIPER_ATM2 }, /* various encapsulations captured on the ATM2 PIC */ diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 7bdd451dff..d2f361d565 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -300,6 +300,9 @@ static const struct encap_type_info { /* WTAP_ENCAP_NETTL_X25 */ { "X25 with nettl headers", "x25-nettl" }, + /* WTAP_ENCAP_JUNIPER_MLPPP */ + { "Juniper MLPPP", "juniper-mlppp" }, + }; /* Name that should be somewhat descriptive. */ diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 400281858f..3c0c28b6e7 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -170,8 +170,9 @@ #define WTAP_GCOM_SERIAL 79 #define WTAP_ENCAP_NETTL_X25 80 #define WTAP_ENCAP_K12 81 +#define WTAP_ENCAP_JUNIPER_MLPPP 82 /* last WTAP_ENCAP_ value + 1 */ -#define WTAP_NUM_ENCAP_TYPES 82 +#define WTAP_NUM_ENCAP_TYPES 83 /* File types that can be read by wiretap. We support writing some many of these file types, too, so we |