Add bounds checks.

[tcpdump] / ethertype.h

diff --git a/ethertype.h b/ethertype.h
index d3c9a53fa731b302248c05f7be77d13df719bcdb..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.18 2002-10-03 16:00:33 hannes 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
@@ -120,15 +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
 
-/* FIXME complete the proto-id to string mapping */
-static const struct tok ethertype_values[] = { 
-    { ETHERTYPE_IP,            "IPv4" },
-    { ETHERTYPE_MPLS,          "MPLS unicast" },
-    { ETHERTYPE_MPLS_MULTI,    "MPLS multicast" },
-    { ETHERTYPE_IPV6,          "IPv6" },
-    { 0, NULL}
-};
+extern const struct tok ethertype_values[];