Fix a minor bug in the ack packet printing.

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index fbc4112874a99aebaee5c9cca5b546c72fb86948..69c7dbaafd99b16eef5277e7ce7bc90476de4e80 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -24,7 +24,7 @@ static const char copyright[] =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.130 1999-10-17 21:37:17 mcr Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.143 2000-01-29 21:00:59 fenner Exp $ (LBL)";
 #endif
 
 /*
@@ -35,6 +35,10 @@ static const char rcsid[] =
  * combined efforts of Van, Steve McCanne and Craig Leres of LBL.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/time.h>
 
@@ -46,6 +50,10 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <ctype.h>
+
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
 
 #include "interface.h"
 #include "addrtoname.h"
@@ -62,10 +70,15 @@ int Nflag;                  /* remove domains from printed host names */
 int Oflag = 1;                 /* run filter code optimizer */
 int pflag;                     /* don't go promiscuous */
 int qflag;                     /* quick (shorter) output */
+int Rflag = 1;                 /* print sequence # field in AH/ESP*/
+int sflag = 0;                 /* use the libsmi to translate OIDs */
 int Sflag;                     /* print raw TCP sequence numbers */
 int tflag = 1;                 /* print packet arrival time */
 int vflag;                     /* verbose */
 int xflag;                     /* print packet in hex */
+int Xflag;                     /* print packet in ascii as well as hex */
+
+char *espsecret = NULL;                /* ESP secret key */
 
 int packettype;
 
@@ -92,6 +105,12 @@ struct printer {
 static struct printer printers[] = {
        { ether_if_print,       DLT_EN10MB },
        { ether_if_print,       DLT_IEEE802 },
+#ifdef DLT_LANE8023
+       { lane_if_print,        DLT_LANE8023 },
+#endif
+#ifdef DLT_CIP
+       { cip_if_print,         DLT_CIP },
+#endif
        { sl_if_print,          DLT_SLIP },
        { sl_bsdos_if_print,    DLT_SLIP_BSDOS },
        { ppp_if_print,         DLT_PPP },
@@ -100,6 +119,9 @@ static struct printer printers[] = {
        { null_if_print,        DLT_NULL },
        { raw_if_print,         DLT_RAW },
        { atm_if_print,         DLT_ATM_RFC1483 },
+#ifdef DLT_CHDLC
+       { chdlc_if_print,       DLT_CHDLC },
+#endif
        { NULL,                 0 },
 };
 
@@ -144,12 +166,16 @@ main(int argc, char **argv)
        else
                program_name = argv[0];
 
-       if (abort_on_misalignment(ebuf) < 0)
+       if (abort_on_misalignment(ebuf, sizeof(ebuf)) < 0)
                error("%s", ebuf);
 
+#ifdef LIBSMI
+       smiInit("tcpdump");
+#endif
+       
        opterr = 0;
        while (
-           (op = getopt(argc, argv, "ac:defF:i:lnNOpqr:s:StT:vw:xY")) != EOF)
+           (op = getopt(argc, argv, "ac:deE:fF:i:lm:nNOpqr:Rs:StT:vw:xXY")) != EOF)
                switch (op) {
 
                case 'a':
@@ -170,6 +196,13 @@ main(int argc, char **argv)
                        ++eflag;
                        break;
 
+               case 'E':
+#ifndef HAVE_LIBCRYPTO
+                       warning("crypto code not compiled in");
+#endif
+                       espsecret = optarg;
+                       break;
+
                case 'f':
                        ++fflag;
                        break;
@@ -198,6 +231,18 @@ main(int argc, char **argv)
                        ++Nflag;
                        break;
 
+               case 'm':
+#ifdef LIBSMI
+                       if (smiLoadModule(optarg) == 0) {
+                               error("could not load MIB module %s", optarg);
+                       }
+                       sflag = 1;
+#else
+                       (void)fprintf(stderr, "%s: ignoring option `-m %s' ",
+                                     program_name, optarg);
+                       (void)fprintf(stderr, "(no libsmi support)\n");
+#endif
+                       
                case 'O':
                        Oflag = 0;
                        break;
@@ -214,6 +259,10 @@ main(int argc, char **argv)
                        RFileName = optarg;
                        break;
 
+               case 'R':
+                       Rflag = 0;
+                       break;
+
                case 's':
                        snaplen = atoi(optarg);
                        if (snaplen <= 0)
@@ -252,6 +301,16 @@ main(int argc, char **argv)
                case 'w':
                        WFileName = optarg;
                        break;
+
+               case 'x':
+                       ++xflag;
+                       break;
+
+               case 'X':
+                       ++xflag;
+                       ++Xflag;
+                       break;
+
 #ifdef YYDEBUG
                case 'Y':
                        {
@@ -261,10 +320,6 @@ main(int argc, char **argv)
                        }
                        break;
 #endif
-               case 'x':
-                       ++xflag;
-                       break;
-
                default:
                        usage();
                        /* NOTREACHED */
@@ -390,6 +445,10 @@ default_print_unaligned(register const u_char *cp, register u_int length)
        register u_int i, s;
        register int nshorts;
 
+       if (Xflag) {
+               ascii_print(cp, length);
+               return;
+       }
        nshorts = (u_int) length / sizeof(u_short);
        i = 0;
        while (--nshorts >= 0) {
@@ -407,33 +466,11 @@ default_print_unaligned(register const u_char *cp, register u_int length)
 
 /*
  * By default, print the packet out in hex.
- *
- * (BTW, please don't send us patches to print the packet out in ascii)
  */
 void
 default_print(register const u_char *bp, register u_int length)
 {
-       register const u_short *sp;
-       register u_int i;
-       register int nshorts;
-
-       if ((long)bp & 1) {
-               default_print_unaligned(bp, length);
-               return;
-       }
-       sp = (u_short *)bp;
-       nshorts = (u_int) length / sizeof(u_short);
-       i = 0;
-       while (--nshorts >= 0) {
-               if ((i++ % 8) == 0)
-                       (void)printf("\n\t\t\t");
-               (void)printf(" %04x", ntohs(*sp++));
-       }
-       if (length & 1) {
-               if ((i % 8) == 0)
-                       (void)printf("\n\t\t\t");
-               (void)printf(" %02x", *(u_char *)sp);
-       }
+  default_print_unaligned(bp, length);
 }
 
 __dead void
@@ -445,7 +482,7 @@ usage(void)
        (void)fprintf(stderr, "%s version %s\n", program_name, version);
        (void)fprintf(stderr, "libpcap version %s\n", pcap_version);
        (void)fprintf(stderr,
-"Usage: %s [-adeflnNOpqStvx] [-c count] [ -F file ]\n", program_name);
+"Usage: %s [-adeflnNOpqStvxX] [-c count] [ -F file ]\n", program_name);
        (void)fprintf(stderr,
 "\t\t[ -i interface ] [ -r file ] [ -s snaplen ]\n");
        (void)fprintf(stderr,