From Toshihiro Kanda, via FreeBSD: fix printing of address in AARP

[tcpdump] / print-token.c

diff --git a/print-token.c b/print-token.c
index 1ef215d28537a8c7a06ea669e25851cd37d03b44..04defa9921b685e942762ba8f608c1602aaa597b 100644 (file)
--- a/print-token.c
+++ b/print-token.c
@@ -25,7 +25,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.25 2004-03-17 23:24:38 guy Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.27 2005-11-13 12:12:43 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -153,7 +153,6 @@ token_print(const u_char *p, u_int length, u_int caplen)
        caplen -= hdr_len;
 
        /* Frame Control field determines interpretation of packet */
-       extracted_ethertype = 0;
        if (FRAME_TYPE(trp) == TOKEN_FC_LLC) {
                /* Try to print the LLC-layer header & higher layers */
                if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr),
@@ -167,7 +166,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 +175,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);