"read_string()" can return a null pointer for the string, so check for

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

diff --git a/etypes.h b/etypes.h
index 10762fb41722c508c42447dbaa8b3df37bba282e..312208ad23c7c8cbff06d9f7e99f6c5e95c0fc05 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.31 2003/03/02 15:50:55 gerald Exp $
+ * $Id: etypes.h,v 1.34 2003/06/11 09:17:00 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -44,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
@@ -199,6 +203,15 @@
 #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_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 */