diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-08-17 20:24:05 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-08-17 20:24:05 +0000 |
| commit | d221d6f2fc4d778e4b250aba4c39a5156cc521a2 (patch) | |
| tree | 182a457d2a3e78bc1de13d6f1915d302737f9505 /wiretap | |
| parent | 7d040193881dc431ec20e471189f99d16a4cbbf8 (diff) | |
From Hannes Gredler:
A patch that adds support for dissection of
libpcap DLT_JUNIPER_VP frames. In addition i have fixed
also the indent for DLT_JUNIPER_GGSN.
svn path=/trunk/; revision=18940
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, 8 insertions, 2 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 0960769588..1878c1ab4c 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -328,7 +328,7 @@ static const struct { { 129, WTAP_ENCAP_ARCNET_LINUX }, { 130, WTAP_ENCAP_JUNIPER_MLPPP }, /* Juniper MLPPP on ML-, LS-, AS- PICs */ { 131, WTAP_ENCAP_JUNIPER_MLFR }, /* Juniper MLFR (FRF.15) on ML-, LS-, AS- PICs */ - {133, WTAP_ENCAP_JUNIPER_GGSN}, + { 133, WTAP_ENCAP_JUNIPER_GGSN}, /* * Values 132-134, 136 not listed here are reserved for use * in Juniper hardware. @@ -408,6 +408,8 @@ static const struct { { 180, WTAP_ENCAP_JUNIPER_FRELAY }, /* C-HDLC frames prepended with meta-information */ { 181, WTAP_ENCAP_JUNIPER_CHDLC }, + /* VOIP Frames prepended with meta-information */ + { 183, WTAP_ENCAP_JUNIPER_VP }, /* diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 9827264768..11c94b6da0 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -360,6 +360,9 @@ static const struct encap_type_info { /* WTAP_ENCAP_BER */ { "ASN.1 Basic Encoding Rules", "ber" }, + + /* WTAP_ENCAP_JUNIPER_VP */ + { "Juniper Voice PIC", "juniper-vp" }, }; /* Name that should be somewhat descriptive. */ diff --git a/wiretap/wtap.h b/wiretap/wtap.h index a46cca7af4..e1aee9ffc3 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -181,9 +181,10 @@ #define WTAP_ENCAP_LINUX_LAPD 88 #define WTAP_ENCAP_CATAPULT_DCT2000 89 #define WTAP_ENCAP_BER 90 +#define WTAP_ENCAP_JUNIPER_VP 91 /* last WTAP_ENCAP_ value + 1 */ -#define WTAP_NUM_ENCAP_TYPES 91 +#define WTAP_NUM_ENCAP_TYPES 92 /* File types that can be read by wiretap. We support writing some many of these file types, too, so we |