X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/1226a40cb01eb295df68f072f43209baac4948cd..b9f915bceb21812e4bd2ca1c616d044b61d596e1:/print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 441cee0f..c93fd6c8 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.106 2008-02-06 10:47:53 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -70,11 +70,14 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_PPPOED,         "PPPoE D" },
     { ETHERTYPE_PPPOES,         "PPPoE S" },
     { ETHERTYPE_EAPOL,          "EAPOL" },
+    { ETHERTYPE_RRCP,           "RRCP" },
     { ETHERTYPE_JUMBO,          "Jumbo" },
     { ETHERTYPE_LOOPBACK,       "Loopback" },
     { ETHERTYPE_ISO,            "OSI" },
     { ETHERTYPE_GRE_ISO,        "GRE-OSI" },
+    { ETHERTYPE_CFM_OLD,        "CFM (old)" },
     { ETHERTYPE_CFM,            "CFM" },
+    { ETHERTYPE_LLDP,           "LLDP" },
     { 0, NULL}
 };
 
@@ -293,6 +296,10 @@ ether_encap_print(u_short ether_type, const u_char *p,
 	        eap_print(gndo, p, length);
 		return (1);
 
+	case ETHERTYPE_RRCP:
+	        rrcp_print(gndo, p - 14 , length + 14);
+		return (1);
+
 	case ETHERTYPE_PPP:
 		if (length) {
 			printf(": ");
@@ -309,9 +316,14 @@ 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);
 
+	case ETHERTYPE_LLDP:
+	        lldp_print(p, length);
+		return (1);
+
         case ETHERTYPE_LOOPBACK:
                 return (1);