"ssn_range" needs to be a copy of "global_ssn_range", so that it's not

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

diff --git a/etypes.h b/etypes.h
index e1c85d1d0d745cf248bdd6ef8068c6727cc42496..0f9811417b20da4180586a8ffc92b829fcde0b18 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.33 2003/04/22 08:50:07 guy Exp $
+ * $Id$
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -37,11 +37,12 @@
 #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
  */
 
 #ifndef ETHERTYPE_VINES_IP
@@ -63,6 +64,10 @@
 #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
@@ -151,12 +156,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
@@ -191,6 +208,10 @@
 #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
@@ -199,10 +220,22 @@
 #define ETHERTYPE_BRDWALK       0x88AE
 #endif
 
+#ifndef ETHERTYPE_RSN_PREAUTH
+#define ETHERTYPE_RSN_PREAUTH  0x88c7  /* 802.11i Pre-Authentication */
+#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*/
+#endif
+
+#ifndef ETHERTYPE_RTCFG
+#define ETHERTYPE_RTCFG                0x9022  /* RTCFG protocol*/
+#endif
+
 #ifndef ETHERTYPE_FCFT
 /* type used to transport FC frames+MDS hdr internal to Cisco's MDS switch */
 #define ETHERTYPE_FCFT          0xFCFC