X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/fb1b6d808f19faae76526a2e3eed52a75fb22ff1..ffa1470e5c7ff0e50028d085a481dc797b0b51ed:/print-lane.c?ds=sidebyside diff --git a/print-lane.c b/print-lane.c index 03e5652d..e775f1fc 100644 --- a/print-lane.c +++ b/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.2 2005-11-13 12:12:59 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -134,7 +134,6 @@ lane_print(const u_char *p, u_int length, u_int caplen) /* * Is it (gag) an 802.3 encapsulation? */ - extracted_ethertype = 0; if (ether_type <= ETHERMTU) { /* Try to print the LLC-layer header & higher layers */ if (llc_print(p, length, caplen, ep->h_source, ep->h_dest, @@ -146,7 +145,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 +153,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); } }