bugfix: bogus SS codepoints, display ctrl field correct, added 'Poll' token for I...

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 2da258d0f5cfaf82e601e7630bcf14fa22f37641..a7acb3b176958f7cc23d9e1503f6afc5806effdf 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -30,7 +30,7 @@ static const char copyright[] _U_ =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.253.2.9 2005-07-06 20:54:49 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.253.2.11 2005-08-23 10:29:41 hannes Exp $ (LBL)";
 #endif
 
 /*
@@ -252,6 +252,18 @@ static struct printer printers[] = {
 #endif
 #ifdef DLT_JUNIPER_SERVICES
        { juniper_services_print, DLT_JUNIPER_SERVICES },
+#endif
+#ifdef DLT_JUNIPER_ETHER
+       { juniper_ether_print, DLT_JUNIPER_ETHER },
+#endif
+#ifdef DLT_JUNIPER_PPP
+       { juniper_ppp_print, DLT_JUNIPER_PPP },
+#endif
+#ifdef DLT_JUNIPER_FRELAY
+       { juniper_frelay_print, DLT_JUNIPER_FRELAY },
+#endif
+#ifdef DLT_JUNIPER_CHDLC
+       { juniper_chdlc_print, DLT_JUNIPER_CHDLC },
 #endif
        { NULL,                 0 },
 };
@@ -653,6 +665,7 @@ main(int argc, char **argv)
 
                case 'q':
                        ++qflag;
+                       ++suppress_default_print;
                        break;
 
                case 'r':
@@ -733,10 +746,12 @@ main(int argc, char **argv)
 
                case 'x':
                        ++xflag;
+                       ++suppress_default_print;
                        break;
 
                case 'X':
                        ++Xflag;
+                       ++suppress_default_print;
                        break;
 
                case 'y':