Fix checksum and offset printing.

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 0711cca9651dac52593238d27d7a50b2789095b3..24d199294fadeb462a484f05be519a6d1e25de8b 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.60 2000-12-18 05:41:59 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.63 2001-03-12 00:24:54 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -117,7 +117,7 @@ ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
                    &extracted_ethertype) == 0) {
                        /* ether_type not known, print raw packet */
                        if (!eflag)
-                               ether_print((u_char *)ep, length);
+                               ether_print((u_char *)ep, length + ETHER_HDRLEN);
                        if (extracted_ethertype) {
                                printf("(LLC %s) ",
                               etherproto_string(htons(extracted_ethertype)));
@@ -226,6 +226,14 @@ ether_encap_print(u_short ethertype, const u_char *p,
                pppoe_print(p, length);
                return (1);
  
+       case ETHERTYPE_PPP:
+               printf("ppp");
+               if (length) {
+                       printf(": ");
+                       ppp_print(p, length);
+               }
+               return (1);
+
        case ETHERTYPE_LAT:
        case ETHERTYPE_SCA:
        case ETHERTYPE_MOPRC: