X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/c9d84d15c5c4dc8eca7594101fe5026080ed641e..38a55e823f75cb6f77088592b27d19dd83f4e12d:/print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 4ce1e736..bd2a7b7b 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -20,7 +20,11 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.46 1999-10-30 05:11:13 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.50 2000-06-10 13:49:52 assar Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
 
 #include <sys/param.h>
@@ -75,10 +79,12 @@ ether_print(register const u_char *bp, u_int length)
 			     length);
 }
 
+static u_short extracted_ethertype;
+
 /*
  * This is the top level routine of the printer.  'p' is the points
- * to the ether header of the packet, 'tvp' is the timestamp,
- * 'length' is the length of the packet off the wire, and 'caplen'
+ * to the ether header of the packet, 'h->tv' is the timestamp,
+ * 'h->length' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
 void
@@ -88,7 +94,6 @@ ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
 	u_int length = h->len;
 	struct ether_header *ep;
 	u_short ether_type;
-	extern u_short extracted_ethertype;
 
 	ts_print(&h->ts);
 
@@ -155,12 +160,11 @@ ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
  * that might want to know what it is.
  */
 
-u_short	extracted_ethertype;
-
 int
 ether_encap_print(u_short ethertype, const u_char *p,
     u_int length, u_int caplen)
 {
+ recurse:
 	extracted_ethertype = ethertype;
 
 	switch (ethertype) {
@@ -194,6 +198,42 @@ ether_encap_print(u_short ethertype, const u_char *p,
 		aarp_print(p, length);
 		return (1);
 
+	case ETHERTYPE_IPX:
+		ipx_print(p, length);
+		return (1);
+
+	case ETHERTYPE_8021Q:
+		printf("802.1Q vlan#%d P%d%s",
+		       ntohs(*(u_int16_t *)p) & 0xfff,
+		       ntohs(*(u_int16_t *)p) >> 13,
+		       (ntohs(*(u_int16_t *)p) & 0x1000) ? " CFI" : "");
+		ethertype = ntohs(*(u_int16_t *)(p + 2));
+		p += 4;
+		length -= 4;
+		caplen -= 4;
+		if (ethertype > ETHERMTU)
+			goto recurse;
+
+		extracted_ethertype = 0;
+
+		if (llc_print(p, length, caplen, p - 18, p - 12) == 0) {
+			/* ether_type not known, print raw packet */
+			if (!eflag)
+				ether_print(p - 18, length + 4);
+			if (extracted_ethertype) {
+				printf("(LLC %s) ",
+			       etherproto_string(htons(extracted_ethertype)));
+			}
+			if (!xflag && !qflag)
+				default_print(p - 18, caplen + 4);
+		}
+		return (1);
+
+	case ETHERTYPE_PPPOED:
+	case ETHERTYPE_PPPOES:
+		pppoe_print(p, length);
+ 		return (1);
+ 
 	case ETHERTYPE_LAT:
 	case ETHERTYPE_SCA:
 	case ETHERTYPE_MOPRC: