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-lane.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-lane.c')
| -rw-r--r-- | contrib/tcpdump/print-lane.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/tcpdump/print-lane.c b/contrib/tcpdump/print-lane.c index 93ef256..25b291d 100644 --- a/contrib/tcpdump/print-lane.c +++ b/contrib/tcpdump/print-lane.c @@ -22,7 +22,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.23 2004/03/17 23:24:37 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.23.2.1 2005/07/07 01:24:37 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -146,7 +146,7 @@ lane_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 if (ether_encap_print(ether_type, p, length, caplen, @@ -154,7 +154,7 @@ lane_print(const u_char *p, u_int length, u_int caplen) /* ether_type not known, print raw packet */ if (!eflag) lane_hdr_print((u_char *)ep, length + sizeof(*ep)); - if (!xflag && !qflag) + if (!suppress_default_print) default_print(p, caplen); } } |
