diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-08-12 21:08:02 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-08-12 21:08:02 +0000 |
| commit | 5e7d129339b58ede6e39c24e30fb898c05c85483 (patch) | |
| tree | e4fe580a38c23e52c53707ab65bc8f1db80af6a2 /wiretap | |
| parent | 4d9cde11f6bd56bceb96718be6e29528860960be (diff) | |
From Hannes Gredler
- add support for Multi-Link Frame-Relay (FRF.15) captures
taken on Juniper ML-, LS-, AS- PICs.
- rework of the common juniper header dissector:
test the extension flag (0x80) which indicates that there are
meta-information like interface-index, interface-name etc.
present
- minor bugfix (LSQ L3-proto masks, direction masks were broken)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15316 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/libpcap.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.h | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index b6136d2398..a7738c4af2 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -308,8 +308,9 @@ static const struct { { 128, WTAP_ENCAP_TZSP }, /* Tazmen Sniffer Protocol */ { 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 */ /* - * Values 131-134, 136 not listed here are reserved for use + * Values 132-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 d2f361d565..8876b9c060 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -303,6 +303,9 @@ static const struct encap_type_info { /* WTAP_ENCAP_JUNIPER_MLPPP */ { "Juniper MLPPP", "juniper-mlppp" }, + /* WTAP_ENCAP_JUNIPER_MLFR */ + { "Juniper MLFR", "juniper-mlfr" }, + }; /* Name that should be somewhat descriptive. */ diff --git a/wiretap/wtap.h b/wiretap/wtap.h index b18b2f74d7..8008dde650 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -171,8 +171,9 @@ #define WTAP_ENCAP_NETTL_X25 80 #define WTAP_ENCAP_K12 81 #define WTAP_ENCAP_JUNIPER_MLPPP 82 +#define WTAP_ENCAP_JUNIPER_MLFR 83 /* last WTAP_ENCAP_ value + 1 */ -#define WTAP_NUM_ENCAP_TYPES 83 +#define WTAP_NUM_ENCAP_TYPES 84 /* File types that can be read by wiretap. We support writing some many of these file types, too, so we |