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

[tcpdump] / print-token.c

diff --git a/print-token.c b/print-token.c
index 37fa2c28d33069bde27e312c1c46d5120a2b9d5e..d17e9506863544d53a840db6f379597b68a0223b 100644 (file)
--- a/print-token.c
+++ b/print-token.c
@@ -23,6 +23,10 @@
  * Further tweaked to more closely resemble print-fddi.c
  *     Guy Harris <[email protected]>
  */
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.26 2005-07-07 01:22:21 guy Exp $";
+#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -38,10 +42,6 @@
 #include "addrtoname.h"
 #include "ethertype.h"
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.23 2003-11-15 00:39:42 guy Exp $";
-#endif
 #include "ether.h"
 #include "token.h"
 
@@ -167,7 +167,7 @@ token_print(const u_char *p, u_int length, u_int caplen)
                                printf("(LLC %s) ",
                        etherproto_string(htons(extracted_ethertype)));
                        }
-                       if (!xflag && !qflag)
+                       if (!suppress_default_print)
                                default_print(p, caplen);
                }
        } else {
@@ -176,7 +176,7 @@ token_print(const u_char *p, u_int length, u_int caplen)
                if (!eflag)
                        token_hdr_print(trp, length + TOKEN_HDRLEN + route_len,
                            ESRC(&ehdr), EDST(&ehdr));
-               if (!xflag && !qflag)
+               if (!suppress_default_print)
                        default_print(p, caplen);
        }
        return (hdr_len);
@@ -185,7 +185,7 @@ token_print(const u_char *p, u_int length, u_int caplen)
 /*
  * This is the top level routine of the printer.  'p' points
  * to the TR header of the packet, 'h->ts' is the timestamp,
- * 'h->length' is the length of the packet off the wire, and 'h->caplen'
+ * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
 u_int