diff options
| author | Philip Rosenberg-Watt <p.rosenberg-watt@cablelabs.com> | 2014-04-22 14:16:40 -0600 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-04-28 15:26:32 +0000 |
| commit | cd68b4744cbad2f7c2137bc082b72267184b477a (patch) | |
| tree | 340c1e3e7ac9aa929fed6f5c8f1fb3395bdd90a9 /wiretap | |
| parent | 484b183e3f437da8fa140087f2486d387810d901 (diff) | |
Add dissector for LINKTYPE_EPON
See IEEE Standard 802.3-2012 Section 5, Clause 65 and CableLabs DPoE
Security and Certificate Specification 1.0, Section 6.
Currently dissects 1G mode. 10G mode will be added when hardware is
available.
Change-Id: I6232af9bf6807644ef66a120d97e5fa5927988fe
Reviewed-on: https://code.wireshark.org/review/1284
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 5 | ||||
| -rw-r--r-- | wiretap/wtap.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.h | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index a53fb47e67..77dd9f3d93 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -427,7 +427,10 @@ static const struct { /* Apple PKTAP */ { 258, WTAP_ENCAP_PKTAP }, - /* + /* Ethernet Passive Optical Network */ + { 259, WTAP_ENCAP_EPON }, + + /* * To repeat: * * If you need a new encapsulation type for libpcap files, do diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 343a9b23c4..403734706c 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -732,6 +732,9 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_PKTAP */ { "Apple PKTAP", "pktap" }, + + /* WTAP_ENCAP_EPON */ + { "Ethernet Passive Optical Network", "epon" }, }; WS_DLL_LOCAL diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 4b2f981128..ea8c3d132e 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -263,6 +263,7 @@ extern "C" { #define WTAP_ENCAP_LOGCAT_THREADTIME 170 #define WTAP_ENCAP_LOGCAT_LONG 171 #define WTAP_ENCAP_PKTAP 172 +#define WTAP_ENCAP_EPON 173 /* After adding new item here, please also add new item to encap_table_base array */ #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |