diff options
| author | guy <guy> | 2005-07-07 01:22:15 +0000 |
|---|---|---|
| committer | guy <guy> | 2005-07-07 01:22:15 +0000 |
| commit | d953299b94043156cab202c486dc5b864f71c633 (patch) | |
| tree | d9178547cd73d7a9716b8dd080f202b9b7218553 /print-ap1394.c | |
| parent | e085b97e4b488bfd158529331e20ebaeb2b79f0f (diff) | |
| download | tcpdump-d953299b94043156cab202c486dc5b864f71c633.tar.gz | |
Add a flag to suppress the "default_print()" call made in various
link-layer print routines if no other print routine claimed the packet.
Test whether that flag is set rather than testing whether neither of -x
or -q were specified, and have -x, -q, *and* -X set that flag, so that
-X suppresses it just as -x does. That way you don't get those pckets
dumped twice if -X was specified.
Diffstat (limited to 'print-ap1394.c')
| -rw-r--r-- | print-ap1394.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/print-ap1394.c b/print-ap1394.c index 07a5df54..21e9c19c 100644 --- a/print-ap1394.c +++ b/print-ap1394.c @@ -20,7 +20,7 @@ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ap1394.c,v 1.3 2004-03-17 23:24:35 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ap1394.c,v 1.4 2005-07-07 01:22:17 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -111,7 +111,7 @@ ap1394_if_print(const struct pcap_pkthdr *h, const u_char *p) if (!eflag) ap1394_hdr_print((u_char *)fp, length + FIREWIRE_HDRLEN); - if (!xflag && !qflag) + if (!suppress_default_print) default_print(p, caplen); } |