diff options
| -rw-r--r-- | epan/dissectors/packet-ethertype.c | 15 | ||||
| -rw-r--r-- | epan/etypes.h | 5 |
2 files changed, 13 insertions, 7 deletions
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index 3a7a4b2bde..34bbdb8f9c 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.c @@ -96,17 +96,18 @@ const value_string etype_vals[] = { {ETHERTYPE_DEC_LAST, "DEC LAST" }, {ETHERTYPE_ETHBRIDGE, "Transparent Ethernet bridging" }, {ETHERTYPE_CGMP, "Cisco Group Management Protocol" }, - {ETHERTYPE_MAC_CONTROL, "MAC Control" }, - {ETHERTYPE_SLOW_PROTOCOLS, "Slow Protocols" }, + {ETHERTYPE_MAC_CONTROL, "MAC Control" }, + {ETHERTYPE_SLOW_PROTOCOLS, "Slow Protocols" }, {ETHERTYPE_RTMAC, "Real-Time Media Access Control" }, {ETHERTYPE_RTCFG, "Real-Time Configuration Protocol" }, {ETHERTYPE_CDMA2000_A10_UBS, "CDMA2000 A10 Unstructured byte stream" }, - {ETHERTYPE_PROFINET, "PROFINET" }, - {ETHERTYPE_AOE, "ATA over Ethernet" }, + {ETHERTYPE_PROFINET, "PROFINET"}, + {ETHERTYPE_AOE, "ATA over Ethernet" }, {ETHERTYPE_ECATF, "EtherCAT frame" }, - {ETHERTYPE_TELKONET, "Telkonet powerline" }, - {ETHERTYPE_EPL_V2, "ETHERNET Powerlink v2" }, - {ETHERTYPE_CSM_ENCAPS, "CSM_ENCAPS Protocol" }, + {ETHERTYPE_TELKONET, "Telkonet powerline" }, + {ETHERTYPE_EPL_V2, "ETHERNET Powerlink v2" }, + {ETHERTYPE_XIMETA, "XiMeta Technology" }, + {ETHERTYPE_CSM_ENCAPS, "CSM_ENCAPS Protocol" }, {ETHERTYPE_IEEE802_OUI_EXTENDED, "IEEE 802a OUI Extended Ethertype" }, {ETHERTYPE_IEC61850_GOOSE, "IEC 61850/GOOSE" }, {ETHERTYPE_IEC61850_GSE, "IEC 61850/GSE management services" }, diff --git a/epan/etypes.h b/epan/etypes.h index af6f9fcd9a..3dfde8158a 100644 --- a/epan/etypes.h +++ b/epan/etypes.h @@ -302,10 +302,15 @@ #define ETHERTYPE_EPL_V2 0x88AB #endif +#ifndef ETHERTYPE_XIMETA +#define ETHERTYPE_XIMETA 0x88AD /* XiMeta Technology Americas Inc. */ +#endif /* proprietary communication protocol */ + #ifndef ETHERTYPE_BRDWALK #define ETHERTYPE_BRDWALK 0x88AE #endif + #ifndef ETHERTYPE_IEEE802_OUI_EXTENDED #define ETHERTYPE_IEEE802_OUI_EXTENDED 0x88B7 /* IEEE 802a OUI Extended Ethertype */ #endif |