Pointers into packet data should usually be pointers to unsigned 1-byte

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index e026539721ce1843775d4eeb523091a587c7583d..13c06174fa1931f8b2056936bd77926c0be0e847 100644 (file)
--- 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.91 2004-04-05 00:14:08 mcr Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.99 2005-07-10 14:41:34 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -65,12 +65,14 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_AARP,           "Appletalk ARP" },
     { ETHERTYPE_IPX,            "IPX" },
     { ETHERTYPE_PPP,            "PPP" },
+    { ETHERTYPE_SLOW,           "Slow Protocols" },
     { ETHERTYPE_PPPOED,         "PPPoE D" },
     { ETHERTYPE_PPPOES,         "PPPoE S" },
     { ETHERTYPE_EAPOL,          "EAPOL" },
     { ETHERTYPE_JUMBO,          "Jumbo" },
     { ETHERTYPE_LOOPBACK,       "Loopback" },
     { ETHERTYPE_ISO,            "OSI" },
+    { ETHERTYPE_GRE_ISO,        "GRE-OSI" },
     { 0, NULL}
 };
 
@@ -135,7 +137,7 @@ ether_print(const u_char *p, u_int length, u_int caplen)
                        if (!eflag)
                                ether_hdr_print((u_char *)ep, length + ETHER_HDRLEN);
 
-                       if (!xflag && !qflag)
+                       if (!suppress_default_print)
                                default_print(p, caplen);
                }
        } else if (ether_encap_print(ether_type, p, length, caplen,
@@ -144,7 +146,7 @@ ether_print(const u_char *p, u_int length, u_int caplen)
                if (!eflag)
                        ether_hdr_print((u_char *)ep, length + ETHER_HDRLEN);
 
-               if (!xflag && !qflag)
+               if (!suppress_default_print)
                        default_print(p, caplen);
        } 
 }
@@ -185,7 +187,7 @@ ether_encap_print(u_short ether_type, const u_char *p,
        switch (ether_type) {
 
        case ETHERTYPE_IP:
-               ip_print(p, length);
+               ip_print(gndo, p, length);
                return (1);
 
 #ifdef INET6
@@ -196,7 +198,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:
@@ -244,7 +246,7 @@ ether_encap_print(u_short ether_type, const u_char *p,
                                ether_hdr_print(p - 18, length + 4);
                }
 
-               if (!xflag && !qflag)
+               if (!suppress_default_print)
                        default_print(p - 18, caplen + 4);
 
                return (1);
@@ -269,7 +271,7 @@ ether_encap_print(u_short ether_type, const u_char *p,
                     ether_hdr_print(p - 16, length + 2);
                 }
 
-                if (!xflag && !qflag)
+                if (!suppress_default_print)
                     default_print(p - 16, caplen + 2);
 
                 return (1);
@@ -294,8 +296,12 @@ ether_encap_print(u_short ether_type, const u_char *p,
                }
                return (1);
 
+       case ETHERTYPE_SLOW:
+               slow_print(p, length);
+               return (1);
+
         case ETHERTYPE_LOOPBACK:
-                return (0);
+                return (1);
 
        case ETHERTYPE_MPLS:
        case ETHERTYPE_MPLS_MULTI:
@@ -311,3 +317,12 @@ ether_encap_print(u_short ether_type, const u_char *p,
                return (0);
        }
 }
+
+
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */
+