Fix a minor bug in the ack packet printing.

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index f331cf8ca0af592bad29815d2dc4c44730504269..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.136 1999-12-13 18:06:15 mcr Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.143 2000-01-29 21:00:59 fenner Exp $ (LBL)";
 #endif
 
 /*
@@ -50,6 +50,7 @@ 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>
@@ -75,8 +76,8 @@ 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 *ahsecret = NULL;         /* AH secret key */
 char *espsecret = NULL;                /* ESP secret key */
 
 int packettype;
@@ -165,7 +166,7 @@ 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
@@ -174,22 +175,13 @@ main(int argc, char **argv)
        
        opterr = 0;
        while (
-           (op = getopt(argc, argv, "ac:deE:fF:i:lnNm:Opqr:Rs:StT:vw:xY")) != EOF)
+           (op = getopt(argc, argv, "ac:deE:fF:i:lm:nNOpqr:Rs:StT:vw:xXY")) != EOF)
                switch (op) {
 
                case 'a':
                        ++aflag;
                        break;
 
-#if 0
-               case 'A':
-#ifndef CRYPTO
-                       warning("crypto code not compiled in");
-#endif
-                       ahsecret = optarg;
-                       break;
-#endif
-
                case 'c':
                        cnt = atoi(optarg);
                        if (cnt <= 0)
@@ -205,7 +197,7 @@ main(int argc, char **argv)
                        break;
 
                case 'E':
-#ifndef CRYPTO
+#ifndef HAVE_LIBCRYPTO
                        warning("crypto code not compiled in");
 #endif
                        espsecret = optarg;
@@ -309,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':
                        {
@@ -318,10 +320,6 @@ main(int argc, char **argv)
                        }
                        break;
 #endif
-               case 'x':
-                       ++xflag;
-                       break;
-
                default:
                        usage();
                        /* NOTREACHED */
@@ -444,57 +442,35 @@ cleanup(int signo)
 void
 default_print_unaligned(register const u_char *cp, register u_int length)
 {
-  register u_int i, s;
-  register int nshorts;
-
-  char line[81];
-  
-  nshorts = (u_int) length / sizeof(u_short);
-  i = 0;
-  memset(line, ' ', 80);
-  line[81]='\0';
-
-  putchar('\n');
-  while (nshorts >= 0) {
-    
-    sprintf(line+20+i*5, "%02x%02x  ", cp[0], cp[1]);
-
-    if(isprint(cp[0])) {
-      line[62+i*2]=cp[0];
-    } else {
-      line[62+i*2]='.';
-    }
-    if(isprint(cp[1])) {
-      line[62+i*2+1]=cp[1];
-    } else {
-      line[62+i*2+1]='.';
-    }
-    i++;
-    if (i == 8) {
-      line[60]=' ';
-      line[61]=' ';
-      line[62+16]='\0';
-      puts(line);
-      i=0;
-    }
-    cp += 2;
-    nshorts--;
-  }
+       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) {
+               if ((i++ % 8) == 0)
+                       (void)printf("\n\t\t\t");
+               s = *cp++;
+               (void)printf(" %02x%02x", s, *cp++);
+       }
+       if (length & 1) {
+               if ((i % 8) == 0)
+                       (void)printf("\n\t\t\t");
+               (void)printf(" %02x", *cp);
+       }
 }
 
 /*
  * 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;
-
-       default_print_unaligned(bp, length);
+  default_print_unaligned(bp, length);
 }
 
 __dead void
@@ -506,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,