diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-03-01 07:39:54 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-03-01 07:39:54 +0000 |
| commit | 23ec82fae9404694b90dc2ce0d1a9a65fe0f6b8c (patch) | |
| tree | e5facadf7bae2b469cb7ee6ddc8af96741dd97f5 /wiretap/wtap.c | |
| parent | b28516dc00dbe70de6bc0e653b4d8ae137cfe05a (diff) | |
From Reinhard Speyerer: Adding support for LINKTYPE_PPP_ETHER/DLT_PPP_ETHER
svn path=/trunk/; revision=41256
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 81c2a668fd..3def7c5c47 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -555,7 +555,10 @@ static struct encap_type_info encap_table_base[] = { { "IP over Infiniband", "ip-over-ib" }, /* WTAP_ENCAP_MPEG_2_TS */ - { "ISO/IEC 13818-1 MPEG2-TS", "mp2ts" } + { "ISO/IEC 13818-1 MPEG2-TS", "mp2ts" }, + + /* WTAP_ENCAP_PPP_ETHER */ + { "PPP-over-Ethernet session", "pppoes" } }; gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info); |