diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-05-11 11:24:17 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-05-11 11:24:17 +0000 |
| commit | 4e3c7cc716c42bfc710683b5df32a8c2578ef2c4 (patch) | |
| tree | 689c7efc9069f5d61752ef84aac4936ca912b7d1 /wiretap | |
| parent | fcab322ada6b72863c18bfbf92cb7324c312529a (diff) | |
From Hannes Gredler
support for Juniper PPPOE encapsulation
svn path=/trunk/; revision=14346
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/libpcap.c | 9 | ||||
| -rw-r--r-- | wiretap/wtap.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.h | 3 |
3 files changed, 12 insertions, 3 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 25c741b0c9..2fc7b78a02 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -356,8 +356,13 @@ static const struct { * 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- + */ + + /* Ethernet PPPoE frames captured on a service PIC */ + { 167, WTAP_ENCAP_JUNIPER_PPPOE }, + + /* + * 168 is reserved for more Juniper private-chassis- * internal meta-information. */ diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 77daab6500..a4a26459bd 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -287,6 +287,9 @@ static const struct encap_type_info { /* WTAP_ENCAP_MTP2_WITH_PHDR */ { "MTP2 with pseudoheader", "mtp2-with-phdr" }, + + /* WTAP_ENCAP_JUNIPER_PPPOE */ + { "Juniper PPPoE", "juniper-pppoe" }, }; /* Name that should be somewhat descriptive. */ diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 4fbc13b499..a6f4ab6cd7 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -165,8 +165,9 @@ #define WTAP_ENCAP_NETTL_FDDI 74 #define WTAP_ENCAP_NETTL_UNKNOWN 75 #define WTAP_ENCAP_MTP2_WITH_PHDR 76 +#define WTAP_ENCAP_JUNIPER_PPPOE 77 /* last WTAP_ENCAP_ value + 1 */ -#define WTAP_NUM_ENCAP_TYPES 77 +#define WTAP_NUM_ENCAP_TYPES 78 /* File types that can be read by wiretap. We support writing some many of these file types, too, so we |