Add bounds checks.

[tcpdump] / ethertype.h

diff --git a/ethertype.h b/ethertype.h
index 3747958625fdafbc0a48fd1974862ed53bde5dcb..a00d82a3cca9bae07921f27ddfa14d6a20cd8e60 100644 (file)
--- a/ethertype.h
+++ b/ethertype.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.14 2001-03-12 00:24:54 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.20 2003-07-01 19:10:26 guy Exp $ (LBL)
  */
 
 /*
@@ -69,9 +69,6 @@
 #ifndef ETHERTYPE_SCA
 #define ETHERTYPE_SCA          0x6007
 #endif
-#ifndef ETHERTYPE_REVARP
-#define ETHERTYPE_REVARP       0x8035
-#endif
 #ifndef        ETHERTYPE_LANBRIDGE
 #define        ETHERTYPE_LANBRIDGE     0x8038
 #endif
@@ -97,7 +94,7 @@
 #define        ETHERTYPE_8021Q         0x8100
 #endif
 #ifndef ETHERTYPE_IPX
-#define ETHERTYPE_IPX          0x8137
+#define ETHERTYPE_IPX          0x8137
 #endif
 #ifndef ETHERTYPE_IPV6
 #define ETHERTYPE_IPV6         0x86dd
@@ -105,6 +102,12 @@
 #ifndef ETHERTYPE_PPP
 #define        ETHERTYPE_PPP           0x880b
 #endif
+#ifndef        ETHERTYPE_MPLS
+#define        ETHERTYPE_MPLS          0x8847
+#endif
+#ifndef        ETHERTYPE_MPLS_MULTI
+#define        ETHERTYPE_MPLS_MULTI    0x8848
+#endif
 #ifndef ETHERTYPE_PPPOED
 #define ETHERTYPE_PPPOED       0x8863
 #endif
@@ -114,3 +117,11 @@
 #ifndef        ETHERTYPE_LOOPBACK
 #define        ETHERTYPE_LOOPBACK      0x9000
 #endif
+#ifndef        ETHERTYPE_VMAN
+#define        ETHERTYPE_VMAN          0x9100 /* Extreme VMAN Protocol */ 
+#endif
+#ifndef        ETHERTYPE_ISO
+#define        ETHERTYPE_ISO           0xfefe  /* nonstandard - used in Cisco HDLC encapsulation */
+#endif
+
+extern const struct tok ethertype_values[];