diff options
author | sam <sam@FreeBSD.org> | 2006-09-04 20:04:42 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2006-09-04 20:04:42 +0000 |
commit | 498672d44881880f8839eb7839500652b77e08b9 (patch) | |
tree | 13652f8bd7a5a6bc4657d530dd6ddfbeef554e16 /contrib/tcpdump/print-token.c | |
parent | 6dcc5281a5e8c0e636fcbf5736a3125dd9d14880 (diff) | |
download | FreeBSD-src-498672d44881880f8839eb7839500652b77e08b9.zip FreeBSD-src-498672d44881880f8839eb7839500652b77e08b9.tar.gz |
Import of tcpdump v3.9.4
Diffstat (limited to 'contrib/tcpdump/print-token.c')
-rw-r--r-- | contrib/tcpdump/print-token.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/tcpdump/print-token.c b/contrib/tcpdump/print-token.c index 0633578..a2b3d0f 100644 --- a/contrib/tcpdump/print-token.c +++ b/contrib/tcpdump/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.25.2.1 2005/07/07 01:24:40 guy Exp $"; #endif #ifdef HAVE_CONFIG_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); |