aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2005-11-21 19:01:52 +0000
committerAnders Broman <anders.broman@ericsson.com>2005-11-21 19:01:52 +0000
commiteba478ca117f0bd8c0183aa7c298f32c06cf52d4 (patch)
treee309fed9e1f905a33028af169af55f66d6e2caca /epan
parentaccf205005341aaa9cd7ac38b3b9daaa3e6d130b (diff)
Add ethertype for TIPC
svn path=/trunk/; revision=16556
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ethertype.c103
1 files changed, 52 insertions, 51 deletions
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index 9e4d0e448e..f81b37fd2c 100644
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -45,60 +45,61 @@ static dissector_table_t ethertype_dissector_table;
static dissector_handle_t data_handle;
const value_string etype_vals[] = {
- {ETHERTYPE_IP, "IP" },
- {ETHERTYPE_IPv6, "IPv6" },
- {ETHERTYPE_CISCOWL, "Cisco Wireless" },
- {ETHERTYPE_CENTRINO_PROMISC, "IEEE 802.11 (Centrino promiscuous)" },
- {ETHERTYPE_XNS_IDP, "XNS Internet Datagram Protocol" },
- {ETHERTYPE_X25L3, "X.25 Layer 3" },
- {ETHERTYPE_ARP, "ARP" },
- {ETHERTYPE_REVARP, "RARP" },
- {ETHERTYPE_DEC_LB, "DEC LanBridge" },
- {ETHERTYPE_ATALK, "Appletalk" },
- {ETHERTYPE_SNA, "SNA-over-Ethernet" },
- {ETHERTYPE_AARP, "AARP" },
- {ETHERTYPE_IPX, "Netware IPX/SPX" },
- {ETHERTYPE_VINES_IP, "Vines IP" },
- {ETHERTYPE_VINES_ECHO, "Vines Echo" },
- {ETHERTYPE_TRAIN, "Netmon Train" },
- {ETHERTYPE_LOOP, "Loopback" }, /* Ethernet Loopback */
- {ETHERTYPE_FOUNDRY, "Foundry proprietary" },
- {ETHERTYPE_WCP, "Wellfleet Compression Protocol" },
- {ETHERTYPE_ISMP, "Cabletron Interswitch Message Protocol" },
- {ETHERTYPE_ISMP_TBFLOOD, "Cabletron SFVLAN 1.8 Tag-Based Flood" },
+ {ETHERTYPE_IP, "IP" },
+ {ETHERTYPE_IPv6, "IPv6" },
+ {ETHERTYPE_CISCOWL, "Cisco Wireless" },
+ {ETHERTYPE_CENTRINO_PROMISC, "IEEE 802.11 (Centrino promiscuous)" },
+ {ETHERTYPE_XNS_IDP, "XNS Internet Datagram Protocol" },
+ {ETHERTYPE_X25L3, "X.25 Layer 3" },
+ {ETHERTYPE_ARP, "ARP" },
+ {ETHERTYPE_REVARP, "RARP" },
+ {ETHERTYPE_DEC_LB, "DEC LanBridge" },
+ {ETHERTYPE_ATALK, "Appletalk" },
+ {ETHERTYPE_SNA, "SNA-over-Ethernet" },
+ {ETHERTYPE_AARP, "AARP" },
+ {ETHERTYPE_IPX, "Netware IPX/SPX" },
+ {ETHERTYPE_VINES_IP, "Vines IP" },
+ {ETHERTYPE_VINES_ECHO, "Vines Echo" },
+ {ETHERTYPE_TRAIN, "Netmon Train" },
+ {ETHERTYPE_LOOP, "Loopback" }, /* Ethernet Loopback */
+ {ETHERTYPE_FOUNDRY, "Foundry proprietary" },
+ {ETHERTYPE_WCP, "Wellfleet Compression Protocol" },
+ {ETHERTYPE_ISMP, "Cabletron Interswitch Message Protocol" },
+ {ETHERTYPE_ISMP_TBFLOOD, "Cabletron SFVLAN 1.8 Tag-Based Flood" },
/* for ISMP, see RFC 2641, RFC 2642, RFC 2643 */
- {ETHERTYPE_PPPOED, "PPPoE Discovery" },
- {ETHERTYPE_PPPOES, "PPPoE Session" },
- {ETHERTYPE_INTEL_ANS, "Intel ANS probe" },
+ {ETHERTYPE_PPPOED, "PPPoE Discovery" },
+ {ETHERTYPE_PPPOES, "PPPoE Session" },
+ {ETHERTYPE_INTEL_ANS, "Intel ANS probe" },
{ETHERTYPE_MS_NLB_HEARTBEAT, "MS NLB heartbeat" },
- {ETHERTYPE_VLAN, "802.1Q Virtual LAN" },
- {ETHERTYPE_EAPOL, "802.1X Authentication" },
- {ETHERTYPE_RSN_PREAUTH, "802.11i Pre-Authentication" },
- {ETHERTYPE_MPLS, "MPLS label switched packet" },
- {ETHERTYPE_MPLS_MULTI, "MPLS multicast label switched packet" },
- {ETHERTYPE_3C_NBP_DGRAM, "3Com NBP Datagram" },
- {ETHERTYPE_DEC, "DEC proto" },
- {ETHERTYPE_DNA_DL, "DEC DNA Dump/Load" },
- {ETHERTYPE_DNA_RC, "DEC DNA Remote Console" },
- {ETHERTYPE_DNA_RT, "DEC DNA Routing" },
- {ETHERTYPE_LAT, "DEC LAT" },
- {ETHERTYPE_DEC_DIAG, "DEC Diagnostics" },
- {ETHERTYPE_DEC_CUST, "DEC Customer use" },
- {ETHERTYPE_DEC_SCA, "DEC LAVC/SCA" },
- {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_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_CSM_ENCAPS, "CSM_ENCAPS Protocol" },
+ {ETHERTYPE_VLAN, "802.1Q Virtual LAN" },
+ {ETHERTYPE_EAPOL, "802.1X Authentication" },
+ {ETHERTYPE_RSN_PREAUTH, "802.11i Pre-Authentication" },
+ {ETHERTYPE_MPLS, "MPLS label switched packet" },
+ {ETHERTYPE_MPLS_MULTI, "MPLS multicast label switched packet" },
+ {ETHERTYPE_3C_NBP_DGRAM, "3Com NBP Datagram" },
+ {ETHERTYPE_DEC, "DEC proto" },
+ {ETHERTYPE_DNA_DL, "DEC DNA Dump/Load" },
+ {ETHERTYPE_DNA_RC, "DEC DNA Remote Console" },
+ {ETHERTYPE_DNA_RT, "DEC DNA Routing" },
+ {ETHERTYPE_LAT, "DEC LAT" },
+ {ETHERTYPE_DEC_DIAG, "DEC Diagnostics" },
+ {ETHERTYPE_DEC_CUST, "DEC Customer use" },
+ {ETHERTYPE_DEC_SCA, "DEC LAVC/SCA" },
+ {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_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_CSM_ENCAPS, "CSM_ENCAPS Protocol" },
{ETHERTYPE_IEEE802_OUI_EXTENDED, "IEEE 802a OUI Extended Ethertype" },
- {ETHERTYPE_LLDP, "802.1 Link Layer Discovery Protocol (LLDP)" },
- {ETHERTYPE_3GPP2, "3GPP2 protocol" },
+ {ETHERTYPE_TIPC, "Transparent Inter Process Communication" },
+ {ETHERTYPE_LLDP, "802.1 Link Layer Discovery Protocol (LLDP)" },
+ {ETHERTYPE_3GPP2, "3GPP2 protocol" },
/*
* NDISWAN on Windows translates Ethernet frames from higher-level
* protocols into PPP frames to hand to the PPP driver, and translates