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/wtap.c | |
| parent | f7af2880e0c9a3697734750bb0b02fd9e1ddeb4b (diff) | |
| download | wireshark-8b0ed89155db5aae5fc003f391dd066a5dfeee74.tar.gz wireshark-8b0ed89155db5aae5fc003f391dd066a5dfeee74.tar.bz2 wireshark-8b0ed89155db5aae5fc003f391dd066a5dfeee74.zip | |
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/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 3 |
1 files changed, 3 insertions, 0 deletions
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. */ |