Make "-x" and "-X" work with PPPoE interfaces; based on code from Darren

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index a28f6652c6ae08492c76100e85df7b852612490e..e715049f412d0338e3ba54a9dfd44da2026a8211 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.67 2002-04-07 09:50:31 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.68 2002-05-29 10:06:26 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -76,7 +76,7 @@ ether_print(const u_char *p, u_int length, u_int caplen)
 
        if (caplen < ETHER_HDRLEN) {
                printf("[|ether]");
-               goto out;
+               return;
        }
 
        if (eflag)
@@ -123,10 +123,6 @@ ether_print(const u_char *p, u_int length, u_int caplen)
                if (!xflag && !qflag)
                        default_print(p, caplen);
        }
-       if (xflag)
-               default_print(p, caplen);
- out:
-       putchar('\n');
 }
 
 /*
@@ -146,6 +142,15 @@ ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
 
        ether_print(p, length, caplen);
 
+       /*
+        * If "-x" was specified, print stuff past the Ethernet header,
+        * if there's anything to print.
+        */
+       if (xflag && caplen > ETHER_HDRLEN)
+               default_print(p + ETHER_HDRLEN, caplen - ETHER_HDRLEN);
+
+       putchar('\n');
+
        --infodelay;
        if (infoprint)
                info(0);