osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Add Ethertype for WAVE Short Message dissection (WSMP). 

svn path=/trunk/; revision=26018
This commit is contained in:
Anders Broman 2008-08-14 17:03:30 +00:00
parent 08281de94b
commit f7e0b6490a
2 changed files with 67 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
epan/dissectors/packet-ethertype.c
View File

@ -46,77 +46,78 @@ 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_WLCCP, "Cisco Wireless Lan Context Control Protocol" },
{ETHERTYPE_IP, "IP" },
{ETHERTYPE_IPv6, "IPv6" },
{ETHERTYPE_WLCCP, "Cisco Wireless Lan Context Control Protocol" },
{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_WOL, "Wake on LAN" },
{ETHERTYPE_WMX_M2M, "WiMax Mac-to-Mac" },
{ETHERTYPE_EPL_V1, "EPL_V1" },
{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_STP, "Spanning Tree Protocol" },
{ETHERTYPE_ISMP, "Cabletron Interswitch Message Protocol" },
{ETHERTYPE_XNS_IDP, "XNS Internet Datagram Protocol" },
{ETHERTYPE_X25L3, "X.25 Layer 3" },
{ETHERTYPE_ARP, "ARP" },
{ETHERTYPE_WOL, "Wake on LAN" },
{ETHERTYPE_WMX_M2M, "WiMax Mac-to-Mac" },
{ETHERTYPE_EPL_V1, "EPL_V1" },
{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_STP, "Spanning Tree 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_HOMEPLUG, "Homeplug" },
{ETHERTYPE_VLAN, "802.1Q Virtual LAN" },
{ETHERTYPE_HOMEPLUG, "Homeplug" },
{ETHERTYPE_VLAN, "802.1Q Virtual LAN" },
{ETHERTYPE_IEEE_802_1AD, "802.1ad Provider Bridge (Q-in-Q)"},
{ETHERTYPE_IEEE_802_1AH, "802.1ah Provider Backbone Bridge (mac-in-mac)"},
{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_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_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_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_ECATF, "EtherCAT frame" },
{ETHERTYPE_TELKONET, "Telkonet powerline" },
{ETHERTYPE_EPL_V2, "ETHERNET Powerlink v2" },
{ETHERTYPE_CSM_ENCAPS, "CSM_ENCAPS Protocol" },
{ETHERTYPE_IEEE802_OUI_EXTENDED, "IEEE 802a OUI Extended Ethertype" },
{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_IEEE802_OUI_EXTENDED, "IEEE 802a OUI Extended Ethertype" },
{ETHERTYPE_IEC61850_GOOSE, "IEC 61850/GOOSE" },
{ETHERTYPE_IEC61850_GSE, "IEC 61850/GSE management services" },
{ETHERTYPE_IEC61850_SV, "IEC 61850/SV (Sampled Value Transmission" },
{ETHERTYPE_TIPC, "Transparent Inter Process Communication" },
{ETHERTYPE_LLDP, "802.1 Link Layer Discovery Protocol (LLDP)" },
{ETHERTYPE_3GPP2, "CDMA2000 A10 3GPP2 Packet" },
{ETHERTYPE_LLTD, "Link Layer Topology Discovery (LLTD)" },
{ETHERTYPE_COBRANET, "Cirrus Cobranet Packet" },
{ETHERTYPE_NSRP, "Juniper Netscreen Redundant Protocol" },
{ETHERTYPE_IEC61850_SV, "IEC 61850/SV (Sampled Value Transmission" },
{ETHERTYPE_TIPC, "Transparent Inter Process Communication" },
{ETHERTYPE_LLDP, "802.1 Link Layer Discovery Protocol (LLDP)" },
{ETHERTYPE_3GPP2, "CDMA2000 A10 3GPP2 Packet" },
{ETHERTYPE_LLTD, "Link Layer Topology Discovery (LLTD)" },
{ETHERTYPE_WSMP, "(WAVE) Short Message Protocol (WSM)" },
{ETHERTYPE_COBRANET, "Cirrus Cobranet Packet" },
{ETHERTYPE_NSRP, "Juniper Netscreen Redundant Protocol" },
/*
* NDISWAN on Windows translates Ethernet frames from higher-level
* protocols into PPP frames to hand to the PPP driver, and translates
@ -138,7 +139,7 @@ const value_string etype_vals[] = {
{PPP_CCP, "PPP Compression Control Protocol" },
{ETHERTYPE_LLT, "Veritas Low Latency Transport (not officially registered)"},
{ETHERTYPE_CFM, "IEEE 802.1ag Connectivity Fault Management (CFM) protocol" },
{ETHERTYPE_FCOE, "Fibre Channel over Ethernet" },
{ETHERTYPE_FCOE, "Fibre Channel over Ethernet" },
{ETHERTYPE_FIP, "FCoE Initialization Protocol" },
{ETHERTYPE_PTP, "PTPv2 over Ethernet (IEEE1588)"},
{ETHERTYPE_PRP, "Parallel Redundancy Protocol (IEC62439 Chapter 6)"},

6
epan/etypes.h
View File

@ -353,9 +353,13 @@
/* through A.S0017-B v1.0). This document already uses the Ether type 8881 */
#ifndef ETHERTYPE_LLTD
#define ETHERTYPE_LLTD 0x88d9 /* Link Layer Topology Discovery (LLTD) */
#define ETHERTYPE_LLTD 0x88d9 /* Link Layer Topology Discovery (LLTD) */
#endif
#ifndef ETHERTYPE_WSMP /* Wireless Access in a Vehicle Environment */
#define ETHERTYPE_WSMP 0x88dc /*(WAVE) Short Message Protocol (WSM) as defined */
#endif /* in IEEE P1609.3. */
#ifndef ETHERTYPE_MRP
#define ETHERTYPE_MRP 0x88e3 /* IEC 61158-6-10 Media Redundancy Protocol (MRP) */
#endif