From: hannes <hannes>
Date: Mon, 23 Jul 2007 09:01:09 +0000 (+0000)
Subject: change 802.1ag pre-standard codepoint to standard codepoint
X-Git-Tag: tcpdump-4.0.0~115
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/9d84f80c5f9b5b29399f3231eb16de7974a56f64?ds=inline

change 802.1ag pre-standard codepoint to standard codepoint
---

diff --git a/ethertype.h b/ethertype.h
index 96d61869..f73f7b0f 100644
--- 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.27 2006-10-12 10:26:12 hannes Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.28 2007-07-23 09:01:09 hannes Exp $ (LBL)
  */
 
 /*
@@ -139,8 +139,11 @@
 #ifndef	ETHERTYPE_VMAN
 #define	ETHERTYPE_VMAN	        0x9100 /* Extreme VMAN Protocol */ 
 #endif
+#ifndef	ETHERTYPE_CFM_OLD
+#define	ETHERTYPE_CFM_OLD       0xabcd /* 802.1ag depreciated */
+#endif
 #ifndef	ETHERTYPE_CFM
-#define	ETHERTYPE_CFM           0xabcd /* 802.1ag - Ethertype is not yet assigned */
+#define	ETHERTYPE_CFM           0x8902 /* 802.1ag */
 #endif
 #ifndef	ETHERTYPE_ISO
 #define	ETHERTYPE_ISO           0xfefe  /* nonstandard - used in Cisco HDLC encapsulation */
diff --git a/print-ether.c b/print-ether.c
index 441cee0f..e54c9d4e 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.103 2006-10-12 10:26:12 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.104 2007-07-23 09:01:09 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -74,6 +74,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_LOOPBACK,       "Loopback" },
     { ETHERTYPE_ISO,            "OSI" },
     { ETHERTYPE_GRE_ISO,        "GRE-OSI" },
+    { ETHERTYPE_CFM_OLD,        "CFM (old)" },
     { ETHERTYPE_CFM,            "CFM" },
     { 0, NULL}
 };
@@ -309,6 +310,7 @@ ether_encap_print(u_short ether_type, const u_char *p,
 		return (1);
 
 	case ETHERTYPE_CFM:
+	case ETHERTYPE_CFM_OLD:
 	        cfm_print(p, length);
 		return (1);