diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-03-02 21:28:05 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-03-02 21:28:05 +0000 |
| commit | 497e0ec77505e2dbf04e7bb5b822cbc713aa03d6 (patch) | |
| tree | 1524201e893417f67b2e83f581c212c909f193ee /wiretap/wtap.c | |
| parent | 3ee39dfc098294aa6725a88256cf9f7cb27b80b7 (diff) | |
From Daniele Orlandi:
The attached patch adds support for LAPD frames captured using vISDN thru
libpcap. The support has already been included in libpcap.
The patch adds a new wiretap encapsulation, the necessary glue to decode
SLL-encapsulated frames, and some minor change in the LAPD dissector in order
to support the remote-to-remote frames captured on the ISDN E-Channel.
Please apply ethereal-encap-table.diff before, as it fixes a misalignment in
the encapsulation names table.
svn path=/trunk/; revision=17450
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index c79faf51f0..3400ff1a05 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -286,6 +286,9 @@ static const struct encap_type_info { /* WTAP_ENCAP_NETTL_RAW_ICMPV6 */ { "Raw ICMPv6 with nettl headers", "raw-icmpv6-nettl" }, + /* UNUSED */ + { "", "" }, + /* WTAP_ENCAP_GPRS_LLC */ { "GPRS LLC", "gprs-llc" }, @@ -328,6 +331,9 @@ static const struct encap_type_info { /* WTAP_ENCAP_NETTL_X25 */ { "X25 with nettl headers", "x25-nettl" }, + /* WTAP_ENCAP_K12 */ + { "K12 protocol analyzer", "k12" }, + /* WTAP_ENCAP_JUNIPER_MLPPP */ { "Juniper MLPPP", "juniper-mlppp" }, @@ -345,6 +351,9 @@ static const struct encap_type_info { /* WTAP_ENCAP_JUNIPER_CHDLC */ { "Juniper C-HDLC", "juniper-chdlc" }, + + /* WTAP_ENCAP_LINUX_LAPD */ + { "LAPD", "lapd" }, }; /* Name that should be somewhat descriptive. */ |