Add a flag to suppress the "default_print()" call made in various

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 4b30d19ce81818500594586ea1ad0b7598a78871..4dd7904e8457221579213f4fd1ad70687e011868 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.95.2.2 2005-07-01 16:16:30 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.95.2.3 2005-07-07 01:24:35 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -136,7 +136,7 @@ ether_print(const u_char *p, u_int length, u_int caplen)
                        if (!eflag)
                                ether_hdr_print((u_char *)ep, length + ETHER_HDRLEN);
 
-                       if (!xflag && !qflag)
+                       if (!suppress_default_print)
                                default_print(p, caplen);
                }
        } else if (ether_encap_print(ether_type, p, length, caplen,
@@ -145,7 +145,7 @@ ether_print(const u_char *p, u_int length, u_int caplen)
                if (!eflag)
                        ether_hdr_print((u_char *)ep, length + ETHER_HDRLEN);
 
-               if (!xflag && !qflag)
+               if (!suppress_default_print)
                        default_print(p, caplen);
        } 
 }
@@ -245,7 +245,7 @@ ether_encap_print(u_short ether_type, const u_char *p,
                                ether_hdr_print(p - 18, length + 4);
                }
 
-               if (!xflag && !qflag)
+               if (!suppress_default_print)
                        default_print(p - 18, caplen + 4);
 
                return (1);
@@ -270,7 +270,7 @@ ether_encap_print(u_short ether_type, const u_char *p,
                     ether_hdr_print(p - 16, length + 2);
                 }
 
-                if (!xflag && !qflag)
+                if (!suppress_default_print)
                     default_print(p - 16, caplen + 2);
 
                 return (1);