keywords and eol-style

[obnox/wireshark/wip.git] / etypes.h

diff --git a/etypes.h b/etypes.h
index 312208ad23c7c8cbff06d9f7e99f6c5e95c0fc05..51aadabbe581581cbc7a438eea5ce65937c865f4 100644 (file)
--- a/etypes.h
+++ b/etypes.h
@@ -1,7 +1,7 @@
 /* etypes.h
  * Defines ethernet packet types, similar to tcpdump's ethertype.h
  *
- * $Id: etypes.h,v 1.34 2003/06/11 09:17:00 guy Exp $
+ * $Id$
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -37,11 +37,20 @@
 #endif
 
 /* Sources:
- * http://www.isi.edu/in-notes/iana/assignments/ethernet-numbers
+ * http://www.iana.org/assignments/ethernet-numbers
  * TCP/IP Illustrated, Volume 1
  * RFCs 894, 1042, 826
  * tcpdump's ethertype.h
  * http://www.cavebear.com/CaveBear/Ethernet/
+ * http://standards.ieee.org/regauth/ethertype/type-pub.html
+ * http://standards.ieee.org/regauth/ethertype/eth.txt
+ * (The first of the two IEEE URLs is the one that the "EtherType Field
+ * Public Assignments" link on the page at
+ *
+ *     http://standards.ieee.org/regauth/ethertype/index.shtml
+ *
+ * goes to, but it is redirected to the second of those - i.e., both
+ * of the IEEE URLs ultimately go to the same page.)
  */
 
 #ifndef ETHERTYPE_VINES_IP
@@ -63,10 +72,18 @@
 #define ETHERTYPE_CGMP         0x2001
 #endif
 
+#ifndef ETHERTYPE_CENTRINO_PROMISC
+#define ETHERTYPE_CENTRINO_PROMISC     0x2452  /* Intel Centrino promiscuous packets */
+#endif
+
 #ifndef ETHERTYPE_3C_NBP_DGRAM
 #define ETHERTYPE_3C_NBP_DGRAM 0x3c07
 #endif
 
+#ifndef ETHERTYPE_XNS_IDP
+#define ETHERTYPE_XNS_IDP      0x0600
+#endif
+
 #ifndef ETHERTYPE_IP
 #define ETHERTYPE_IP           0x0800
 #endif
@@ -112,7 +129,11 @@
 #endif
 
 #ifndef ETHERTYPE_ETHBRIDGE
-#define ETHERTYPE_ETHBRIDGE    0x6558  /* transparent Ethernet bridging */
+#define ETHERTYPE_ETHBRIDGE    0x6558  /* transparent Ethernet bridging [RFC1701]*/
+#endif
+
+#ifndef ETHERTYPE_RAW_FR
+#define ETHERTYPE_RAW_FR       0x6559  /* Raw Frame Relay        [RFC1701] */
 #endif
 
 #ifndef ETHERTYPE_REVARP
@@ -123,6 +144,10 @@
 #define ETHERTYPE_DEC_LB       0x8038
 #endif
 
+#ifndef ETHERTYPE_DEC_LAST
+#define ETHERTYPE_DEC_LAST     0x8041  /* DEC Local Area Systems Transport */
+#endif
+
 #ifndef ETHERTYPE_ATALK
 #define ETHERTYPE_ATALK                0x809b
 #endif
@@ -151,12 +176,24 @@
 #define ETHERTYPE_WCP          0x80ff  /* Wellfleet Compression Protocol */
 #endif
 
+#ifndef ETHERTYPE_ISMP
+#define ETHERTYPE_ISMP         0x81fd  /* Cabletron Interswitch Message Protocol */
+#endif
+
+#ifndef ETHERTYPE_ISMP_TBFLOOD
+#define ETHERTYPE_ISMP_TBFLOOD 0x81ff  /* Cabletron Interswitch Message Protocol */
+#endif
+
 #ifndef ETHERTYPE_IPv6
 #define ETHERTYPE_IPv6         0x86dd
 #endif
 
+#ifndef ETHERTYPE_MAC_CONTROL
+#define ETHERTYPE_MAC_CONTROL  0x8808
+#endif
+
 #ifndef ETHERTYPE_SLOW_PROTOCOLS
-#define ETHERTYPE_SLOW_PROTOCOLS               0x8809
+#define ETHERTYPE_SLOW_PROTOCOLS       0x8809
 #endif
 
 #ifndef ETHERTYPE_PPP
@@ -187,24 +224,52 @@
 #define ETHERTYPE_MS_NLB_HEARTBEAT     0x886f  /* MS Network Load Balancing heartbeat http://www.microsoft.com/technet/treeview/default.asp?url=/TechNet/prodtechnol/windows2000serv/deploy/confeat/nlbovw.asp */
 #endif
 
+#ifndef ETHERTYPE_CDMA2000_A10_UBS
+#define ETHERTYPE_CDMA2000_A10_UBS     0x8881  /* the byte stream protocol that is used for IP based micro-mobility bearer interfaces (A10) in CDMA2000(R)-based wireless networks */
+#endif
+
 #ifndef ETHERTYPE_EAPOL
 #define ETHERTYPE_EAPOL        0x888e  /* 802.1x Authentication */
 #endif
 
+#ifndef ETHERTYPE_PROFINET
+#define ETHERTYPE_PROFINET     0x8892  /* PROFIBUS PROFInet protocol */
+#endif
+
 #ifndef ETHERTYPE_HYPERSCSI
 #define ETHERTYPE_HYPERSCSI     0x889A  /* HyperSCSI */
 #endif
 
+#ifndef ETHERTYPE_AOE
+#define ETHERTYPE_AOE           0x88A2
+#endif
+
 #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
+
+#ifndef ETHERTYPE_RSN_PREAUTH
+#define ETHERTYPE_RSN_PREAUTH  0x88c7  /* 802.11i Pre-Authentication */
+#endif
+
+#ifndef ETHERTYPE_LLDP
+#define ETHERTYPE_LLDP         0x88cc  /* IEEE 802.1 Link Layer Discovery Protocol (LLDP) */
+#endif
+
 #ifndef ETHERTYPE_LOOP
 #define ETHERTYPE_LOOP         0x9000  /* used for layer 2 testing (do i see my own frames on the wire) */
 #endif
 
-#ifndef ETHERTYPE_RTNET
-#define ETHERTYPE_RTNET                0x9021  /* RTNET protocol*/
+#ifndef ETHERTYPE_RTMAC
+#define ETHERTYPE_RTMAC                0x9021  /* RTnet: Real-Time Media Access Control */
+#endif
+
+#ifndef ETHERTYPE_RTCFG
+#define ETHERTYPE_RTCFG                0x9022  /* RTnet: Real-Time Configuration Protocol */
 #endif
 
 #ifndef ETHERTYPE_FCFT