X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/3a919068a93e81fb249a2374cb9e2ad7d1e1fc51..fc80a87e4c7e921dca5edcf53373f60a76123a41:/print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 71c28a5f..c8fb45d3 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.88 2004-02-18 14:23:27 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.92 2004-04-30 16:42:15 mcr Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -38,8 +38,6 @@ static const char rcsid[] _U_ =
 
 #include "ether.h"
 
-const u_char *snapend;
-
 const struct tok ethertype_values[] = { 
     { ETHERTYPE_IP,		"IPv4" },
     { ETHERTYPE_MPLS,		"MPLS unicast" },
@@ -69,6 +67,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_PPP,            "PPP" },
     { ETHERTYPE_PPPOED,         "PPPoE D" },
     { ETHERTYPE_PPPOES,         "PPPoE S" },
+    { ETHERTYPE_EAPOL,          "EAPOL" },
     { ETHERTYPE_JUMBO,          "Jumbo" },
     { ETHERTYPE_LOOPBACK,       "Loopback" },
     { ETHERTYPE_ISO,            "OSI" },
@@ -153,7 +152,7 @@ ether_print(const u_char *p, u_int length, u_int caplen)
 /*
  * This is the top level routine of the printer.  'p' points
  * to the ether header of the packet, 'h->ts' is the timestamp,
- * 'h->length' is the length of the packet off the wire, and 'h->caplen'
+ * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
 u_int
@@ -197,7 +196,7 @@ ether_encap_print(u_short ether_type, const u_char *p,
 
 	case ETHERTYPE_ARP:
 	case ETHERTYPE_REVARP:
-		arp_print(p, length, caplen);
+  	        arp_print(gndo, p, length, caplen);
 		return (1);
 
 	case ETHERTYPE_DN:
@@ -284,6 +283,10 @@ ether_encap_print(u_short ether_type, const u_char *p,
 		pppoe_print(p, length);
 		return (1);
 
+	case ETHERTYPE_EAPOL:
+	        eap_print(gndo, p, length);
+		return (1);
+
 	case ETHERTYPE_PPP:
 		if (length) {
 			printf(": ");
@@ -308,3 +311,10 @@ ether_encap_print(u_short ether_type, const u_char *p,
 		return (0);
 	}
 }
+
+/*
+ * Local Variables:
+ * c-style: bsd
+ * End:
+ */
+