From Martin Regner: fix dissection of non-standard parameters.

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

diff --git a/etypes.h b/etypes.h
index 47f4a672f9ab3d19fd292a93cdac630df42c054d..312208ad23c7c8cbff06d9f7e99f6c5e95c0fc05 100644 (file)
--- a/etypes.h
+++ b/etypes.h
@@ -1,23 +1,22 @@
 /* etypes.h
  * Defines ethernet packet types, similar to tcpdump's ethertype.h
  *
- * $Id: etypes.h,v 1.20 2001/06/14 20:05:12 guy Exp $
+ * $Id: etypes.h,v 1.34 2003/06/11 09:17:00 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
  *
- * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -45,8 +44,12 @@
  * http://www.cavebear.com/CaveBear/Ethernet/
  */
 
-#ifndef ETHERTYPE_VINES
-#define ETHERTYPE_VINES                0x0bad
+#ifndef ETHERTYPE_VINES_IP
+#define ETHERTYPE_VINES_IP     0x0bad
+#endif
+
+#ifndef ETHERTYPE_VINES_ECHO
+#define ETHERTYPE_VINES_ECHO   0x0baf
 #endif
 
 #ifndef ETHERTYPE_TRAIN
@@ -56,6 +59,10 @@
 #define ETHERTYPE_TRAIN                0x1984
 #endif
 
+#ifndef ETHERTYPE_CGMP
+#define ETHERTYPE_CGMP         0x2001
+#endif
+
 #ifndef ETHERTYPE_3C_NBP_DGRAM
 #define ETHERTYPE_3C_NBP_DGRAM 0x3c07
 #endif
@@ -120,6 +127,10 @@
 #define ETHERTYPE_ATALK                0x809b
 #endif
 
+#ifndef ETHERTYPE_SNA
+#define ETHERTYPE_SNA          0x80d5
+#endif
+
 #ifndef ETHERTYPE_AARP
 #define ETHERTYPE_AARP         0x80f3
 #endif
@@ -144,6 +155,10 @@
 #define ETHERTYPE_IPv6         0x86dd
 #endif
 
+#ifndef ETHERTYPE_SLOW_PROTOCOLS
+#define ETHERTYPE_SLOW_PROTOCOLS               0x8809
+#endif
+
 #ifndef ETHERTYPE_PPP
 #define ETHERTYPE_PPP          0x880b  /* no, this is not PPPoE */
 #endif
@@ -164,13 +179,39 @@
 #define ETHERTYPE_PPPOES       0x8864  /* PPPoE Session Protocol */
 #endif
 
+#ifndef ETHERTYPE_INTEL_ANS
+#define ETHERTYPE_INTEL_ANS    0x886d  /* Intel ANS (NIC teaming) http://www.intel.com/support/network/adapter/ans/probes.htm */
+#endif
+
+#ifndef ETHERTYPE_MS_NLB_HEARTBEAT
+#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_EAPOL
+#define ETHERTYPE_EAPOL        0x888e  /* 802.1x Authentication */
+#endif
+
+#ifndef ETHERTYPE_HYPERSCSI
+#define ETHERTYPE_HYPERSCSI     0x889A  /* HyperSCSI */
+#endif
+
+#ifndef ETHERTYPE_BRDWALK
+#define ETHERTYPE_BRDWALK       0x88AE
+#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_PAP
-#define ETHERTYPE_PAP          0xC023 /* Quick & dirty. just to indicate the PAP protocol*/
+#ifndef ETHERTYPE_RTNET
+#define ETHERTYPE_RTNET                0x9021  /* RTNET protocol*/
 #endif
+
+#ifndef ETHERTYPE_FCFT
+/* type used to transport FC frames+MDS hdr internal to Cisco's MDS switch */
+#define ETHERTYPE_FCFT          0xFCFC
+#endif
+
 extern const value_string etype_vals[];
 
 #endif /* etypes.h */