Fix the parenthesization in the "alignment required but you can

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 072496547fda30716e7cfe8867185bcda0b961f6..9bf61bbc202ff0d891e8be6061b77cd2ac59fd72 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.244 2004-06-15 23:05:05 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.248 2004-09-04 00:08:04 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -154,6 +154,9 @@ static struct printer printers[] = {
        { sl_bsdos_if_print,    DLT_SLIP_BSDOS },
 #endif
        { ppp_if_print,         DLT_PPP },
+#ifdef DLT_PPP_WITHDIRECTION
+       { ppp_if_print,         DLT_PPP_WITHDIRECTION },
+#endif
 #ifdef DLT_PPP_BSDOS
        { ppp_bsdos_if_print,   DLT_PPP_BSDOS },
 #endif
@@ -388,7 +391,7 @@ static int tcpdump_printf(netdissect_options *ndo _U_,
   va_end(args);
 
   return ret;
-};
+}
 
 int
 main(int argc, char **argv)
@@ -699,7 +702,6 @@ main(int argc, char **argv)
                        break;
 
                case 'X':
-                       ++xflag;
                        ++Xflag;
                        break;
 
@@ -746,6 +748,15 @@ main(int argc, char **argv)
        case 4: /* Default + Date*/
                thiszone = gmt2local(0);
                break;
+
+       case 1: /* No time stamp */
+       case 2: /* Unix timeval style */
+       case 3: /* Microseconds since previous packet */
+               break;
+
+       default: /* Not supported */
+               error("only -t, -tt, -ttt, and -tttt are supported");
+               break;
        }
 
 #ifdef WITH_CHROOT
@@ -1185,7 +1196,26 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
                        /*
                         * Include the link-layer header.
                         */
-                       default_print(sp, h->caplen);
+                       hex_print("\n\t", sp, h->caplen);
+               } else {
+                       /*
+                        * Don't include the link-layer header - and if
+                        * we have nothing past the link-layer header,
+                        * print nothing.
+                        */
+                       if (h->caplen > hdrlen)
+                               hex_print("\n\t", sp + hdrlen,
+                                   h->caplen - hdrlen);
+               }
+       } else if (Xflag) {
+               /*
+                * Print the raw packet data.
+                */
+               if (Xflag > 1) {
+                       /*
+                        * Include the link-layer header.
+                        */
+                       ascii_print("\n\t", sp, h->caplen);
                } else {
                        /*
                         * Don't include the link-layer header - and if
@@ -1193,7 +1223,7 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
                         * print nothing.
                         */
                        if (h->caplen > hdrlen)
-                               default_print(sp + hdrlen,
+                               ascii_print("\n\t", sp + hdrlen,
                                    h->caplen - hdrlen);
                }
        }
@@ -1238,7 +1268,7 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 void
 default_print(register const u_char *bp, register u_int length)
 {
-    ascii_print("\n\t", bp, length); /* pass on lf and identation string */
+       ascii_print("\n\t", bp, length); /* pass on lf and identation string */
 }
 
 #ifdef SIGINFO
@@ -1307,9 +1337,9 @@ usage(void)
        (void)fprintf(stderr,
 "\t\t[ -E algo:secret ] [ -F file ] [ -i interface ] [ -M secret ]\n");
        (void)fprintf(stderr,
-"\t\t[ -r file ] [ -s snaplen ] [ -T type ] [ -w file ] [ -W filecount ]\n");
+"\t\t[ -r file ] [ -s snaplen ] [ -T type ] [ -w file ]\n");
        (void)fprintf(stderr,
-"\t\t[ -y datalinktype ] [ -Z user ]\n");
+"\t\t[ -W filecount ] [ -y datalinktype ] [ -Z user ]\n");
        (void)fprintf(stderr,
 "\t\t[ expression ]\n");
        exit(1);
@@ -1318,7 +1348,7 @@ usage(void)
 
 
 /* VARARGS */
-void
+static void
 ndo_error(netdissect_options *ndo _U_, const char *fmt, ...)
 {
        va_list ap;
@@ -1337,7 +1367,7 @@ ndo_error(netdissect_options *ndo _U_, const char *fmt, ...)
 }
 
 /* VARARGS */
-void
+static void
 ndo_warning(netdissect_options *ndo _U_, const char *fmt, ...)
 {
        va_list ap;