diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-08-12 21:08:02 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-08-12 21:08:02 +0000 |
| commit | 8b0ed89155db5aae5fc003f391dd066a5dfeee74 (patch) | |
| tree | e4fe580a38c23e52c53707ab65bc8f1db80af6a2 /wiretap/libpcap.c | |
| parent | f7af2880e0c9a3697734750bb0b02fd9e1ddeb4b (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)
svn path=/trunk/; revision=15316
Diffstat (limited to 'wiretap/libpcap.c')
| -rw-r--r-- | wiretap/libpcap.c | 3 |
1 files changed, 2 insertions, 1 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 */ |