made extracted_ethertype static. Added 802.1Q (vlan) and PPPoE. From

[email protected]

diff --git a/print-ether.c b/print-ether.c
index 4ce1e736355a40e5d8285459f408c38bb78232e6..e422b974567239240a9e63bb43a14382578ed3b6 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -20,7 +20,7 @@
  */
 #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.47 1999-11-21 03:53:34 assar Exp $ (LBL)";
 #endif
 
 #include <sys/param.h>
@@ -75,10 +75,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 +90,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 +156,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 +194,38 @@ ether_encap_print(u_short ethertype, const u_char *p,
                aarp_print(p, length);
                return (1);
 
+       case ETHERTYPE_8021Q:
+               printf("802.1Q vlan#%d P%d%s",
+                      ntohs(*(unsigned short*)p)&0xFFF,
+                      ntohs(*(unsigned short*)p)>>13,
+                      (ntohs(*(unsigned short*)p)&0x1000) ? " CFI" : "");
+               ethertype = ntohs(*(unsigned short*)(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: