diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-09-20 20:25:55 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-09-20 20:25:55 +0000 |
| commit | df2153671004143b9c6dd904fa14a7e0be1ac193 (patch) | |
| tree | 9642fe12ce030be6ab99e77912a24bebfeb97f57 /wiretap | |
| parent | ff34f18d67d1a1888081fd32566e78b5af049b48 (diff) | |
From Hannes Gredler:
patch to support 4 additional juniper DLTs.
all those are wrappers for exisiting media types augmented with meta-information which gets also displayed using this patch;
svn path=/trunk/; revision=15908
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/libpcap.c | 10 | ||||
| -rw-r--r-- | wiretap/wtap.c | 11 | ||||
| -rw-r--r-- | wiretap/wtap.h | 6 |
3 files changed, 26 insertions, 1 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 7226f78585..435cb1f06a 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -378,6 +378,16 @@ static const struct { { 172, WTAP_GCOM_TIE1 }, { 173, WTAP_GCOM_SERIAL }, + /* Ethernet frames prepended with meta-information */ + { 178, WTAP_ENCAP_JUNIPER_ETHER }, + /* PPP frames prepended with meta-information */ + { 179, WTAP_ENCAP_JUNIPER_PPP }, + /* Frame-Relay frames prepended with meta-information */ + { 180, WTAP_ENCAP_JUNIPER_FRELAY }, + /* C-HDLC frames prepended with meta-information */ + { 181, WTAP_ENCAP_JUNIPER_CHDLC }, + + /* * To repeat: * diff --git a/wiretap/wtap.c b/wiretap/wtap.c index cb12f65ba9..151d294d31 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -341,6 +341,17 @@ static const struct encap_type_info { /* WTAP_ENCAP_JUNIPER_MLFR */ { "Juniper MLFR", "juniper-mlfr" }, + /* WTAP_ENCAP_JUNIPER_ETHER */ + { "Juniper Ethernet", "juniper-ether" }, + + /* WTAP_ENCAP_JUNIPER_PPP */ + { "Juniper PPP", "juniper-ppp" }, + + /* WTAP_ENCAP_JUNIPER_FRELAY */ + { "Juniper Frame-Relay", "juniper-frelay" }, + + /* WTAP_ENCAP_JUNIPER_CHDLC */ + { "Juniper C-HDLC", "juniper-chdlc" }, }; /* Name that should be somewhat descriptive. */ diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 81774048bf..409527359e 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -173,8 +173,12 @@ #define WTAP_ENCAP_K12 81 #define WTAP_ENCAP_JUNIPER_MLPPP 82 #define WTAP_ENCAP_JUNIPER_MLFR 83 +#define WTAP_ENCAP_JUNIPER_ETHER 84 +#define WTAP_ENCAP_JUNIPER_PPP 85 +#define WTAP_ENCAP_JUNIPER_FRELAY 86 +#define WTAP_ENCAP_JUNIPER_CHDLC 87 /* last WTAP_ENCAP_ value + 1 */ -#define WTAP_NUM_ENCAP_TYPES 84 +#define WTAP_NUM_ENCAP_TYPES 88 /* File types that can be read by wiretap. We support writing some many of these file types, too, so we |