"-A" flag to print packet data in ASCII, from Jørgen Thomsen

<[email protected]>.

diff --git a/CREDITS b/CREDITS
index 51b1612d5694570d09c2f0f533d5ce02765b6246..84c34ea646daad2bd2baedf8db96d196b134fbbd 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -40,6 +40,7 @@ Additional people who have contributed patches:
        Jeffrey Hutzelman               <[email protected]>
        Jim Hutchins                    <[email protected]>
        JINMEI Tatuya                   <[email protected]>
+       Jørgen Thomsen                  <[email protected]> 
        Juergen Schoenwaelder           <[email protected]>
        Julian Cowley                   <[email protected]>
        Kaarthik Sivakumar              <[email protected]>

diff --git a/interface.h b/interface.h
index 033debe0ee96cbb8e98853dc481d090125cc51b6..9c5483d1ed55f46300e655c3f922186cdd89288e 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.180 2002-04-07 09:50:30 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.181 2002-04-24 06:55:55 guy Exp $ (LBL)
  */
 
 #ifndef tcpdump_interface_h
@@ -79,7 +79,7 @@ extern int uflag;             /* Print undecoded NFS handles */
 extern int vflag;              /* verbose */
 extern int xflag;              /* print packet in hex */
 extern int Xflag;              /* print packet in hex/ascii */
-
+extern int Aflag;              /* print packet only in ascii observing TAB, LF, CR and SPACE as graphical chars */
 extern char *espsecret;
 extern struct esp_algorithm *espsecret_xform;   /* cache of decoded alg. */
 extern char                 *espsecret_key;

diff --git a/print-ascii.c b/print-ascii.c
index c8f65fd3fb4f51f42baae23d20c4b680e14d1c0b..14616aae9b7187fde40a691a3ad2fcf6c945427e 100644 (file)
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.6 2000-01-29 16:47:46 itojun Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.7 2002-04-24 06:55:55 guy Exp $";
 #endif
 #include <stdio.h>
 #include <sys/types.h>
@@ -50,6 +50,7 @@ static const char rcsid[] =
 
 #include "interface.h"
 
+#define ASCII_LINELENGTH 300
 #define HEXDUMP_BYTES_PER_LINE 16
 #define HEXDUMP_SHORTS_PER_LINE (HEXDUMP_BYTES_PER_LINE / 2)
 #define HEXDUMP_HEXSTUFF_PER_SHORT 5 /* 4 hex digits and a space */
@@ -64,41 +65,64 @@ ascii_print_with_offset(register const u_char *cp, register u_int length,
        register int s1, s2;
        register int nshorts;
        char hexstuff[HEXDUMP_SHORTS_PER_LINE*HEXDUMP_HEXSTUFF_PER_SHORT+1], *hsp;
-       char asciistuff[HEXDUMP_BYTES_PER_LINE+1], *asp;
+       char asciistuff[ASCII_LINELENGTH+1], *asp;
+       int maxlength = (Aflag ? ASCII_LINELENGTH : HEXDUMP_SHORTS_PER_LINE);
 
        nshorts = length / sizeof(u_short);
        i = 0;
        hsp = hexstuff; asp = asciistuff;
+       if (Aflag) *(asp++) = '\n';
        while (--nshorts >= 0) {
                s1 = *cp++;
                s2 = *cp++;
-               (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
-                   " %02x%02x", s1, s2);
-               hsp += HEXDUMP_HEXSTUFF_PER_SHORT;
-               *(asp++) = (isgraph(s1) ? s1 : '.');
-               *(asp++) = (isgraph(s2) ? s2 : '.');
-               if (++i >= HEXDUMP_SHORTS_PER_LINE) {
-                   *hsp = *asp = '\0';
-                   (void)printf("\n0x%04x\t%-*s\t%s",
-                                oset, HEXDUMP_HEXSTUFF_PER_LINE,
-                                hexstuff, asciistuff);
-                   i = 0; hsp = hexstuff; asp = asciistuff;
-                   oset += HEXDUMP_BYTES_PER_LINE;
+               if (Aflag) {
+                       i += 2;
+                       *(asp++) = (isgraph(s1) ? s1 : (s1 != '\t' && s1 != ' ' && s1 != '\n' && s1 != '\r' ? '.' : s1) );
+                       *(asp++) = (isgraph(s2) ? s2 : (s2 != '\t' && s2 != ' ' && s2 != '\n' && s2 != '\r' ? '.' : s2) );
+                       if (s1 == '\n' || s2 == '\n') i = maxlength;
+
+               } else {
+                       (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
+                           " %02x%02x", s1, s2);
+                       hsp += HEXDUMP_HEXSTUFF_PER_SHORT;
+                       *(asp++) = (isgraph(s1) ? s1 : '.');
+                       *(asp++) = (isgraph(s2) ? s2 : '.');
+                       i++;
+               }
+               if (i >= maxlength) {
+                       *hsp = *asp = '\0';
+                       if (Aflag) {
+                               (void)printf("%s", asciistuff);
+                       } else {
+                               (void)printf("\n0x%04x\t%-*s\t%s",
+                                   oset, HEXDUMP_HEXSTUFF_PER_LINE,
+                                   hexstuff, asciistuff);
+                       }
+                       i = 0; hsp = hexstuff; asp = asciistuff;
+                       oset += HEXDUMP_BYTES_PER_LINE;
                }
        }
        if (length & 1) {
                s1 = *cp++;
-               (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
-                   " %02x", s1);
-               hsp += 3;
-               *(asp++) = (isgraph(s1) ? s1 : '.');
+               if (Aflag) {
+                       *(asp++) = (isgraph(s1) ? s1 : (s1 != '\t' && s1 != ' ' && s1 != '\n' && s1 != '\r' ? '.' : s1) );
+               } else {
+                       (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
+                           " %02x", s1);
+                       hsp += 3;
+                       *(asp++) = (isgraph(s1) ? s1 : '.');
+               }
                ++i;
        }
        if (i > 0) {
                *hsp = *asp = '\0';
-               (void)printf("\n0x%04x\t%-*s\t%s",
+               if (Aflag) {
+                       (void)printf("\n%s", asciistuff);
+               } else {
+                       (void)printf("\n0x%04x\t%-*s\t%s",
                             oset, HEXDUMP_HEXSTUFF_PER_LINE,
                             hexstuff, asciistuff);
+               }
        }
 }
 

diff --git a/tcpdump.1 b/tcpdump.1
index 74fa4ea7d7cce95a0e07d68531babf15be369143..88fd36c2965e73f915446cb2e3e9f49449aa90ca 100644 (file)
--- a/tcpdump.1
+++ b/tcpdump.1
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/tcpdump/Attic/tcpdump.1,v 1.117 2002-02-10 00:36:40 guy Exp $ (LBL)
+.\" @(#) $Header: /tcpdump/master/tcpdump/Attic/tcpdump.1,v 1.118 2002-04-24 06:55:55 guy Exp $ (LBL)
 .\"
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1997
 .\"    The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@ tcpdump \- dump traffic on a network
 .na
 .B tcpdump
 [
-.B \-adeflnNOpqRStuvxX
+.B \-aAdeflnNOpqRStuvxX
 ] [
 .B \-c
 .I count
@@ -184,6 +184,10 @@ You must have read access to
 Reading a saved packet file doesn't require special privileges.
 .SH OPTIONS
 .TP
+.TP
+.B \-A
+Print each packet (minus its link level header) in ASCII.  Handy for
+capturing web pages.
 .B \-a
 Attempt to convert network and broadcast addresses to names.
 .TP

diff --git a/tcpdump.c b/tcpdump.c
index 785dce7aa444e0f3927ac8c899d5cddf2b675639..6e1c018772f0b83bce1559ab7ebbdd3ab82cb5f4 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -30,7 +30,7 @@ static const char copyright[] =
     "@(#) 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[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.174 2002-02-05 10:07:40 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.175 2002-04-24 06:55:56 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -83,6 +83,7 @@ int vflag;                    /* verbose */
 int xflag;                     /* print packet in hex */
 int Xflag;                     /* print packet in ascii as well as hex */
 off_t Cflag = 0;                /* rotate dump files after this many bytes */
+int Aflag = 0;                  /* print packet only in ascii observing LF, CR, TAB, SPACE */
 
 char *espsecret = NULL;                /* ESP secret key */
 
@@ -221,13 +222,19 @@ main(int argc, char **argv)
        
        opterr = 0;
        while (
-           (op = getopt(argc, argv, "ac:C:deE:fF:i:lm:nNOpqr:Rs:StT:uvw:xXY")) != -1)
+           (op = getopt(argc, argv, "aAc:C:deE:fF:i:lm:nNOpqr:Rs:StT:uvw:xXY")) != -1)
                switch (op) {
 
                case 'a':
                        ++aflag;
                        break;
 
+               case 'A':
+                       ++xflag;
+                       ++Xflag;
+                       ++Aflag;
+                       break; 
+
                case 'c':
                        cnt = atoi(optarg);
                        if (cnt <= 0)
@@ -641,7 +648,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 [-adeflnNOpqRStuvxX] [ -c count ] [ -C file_size ]\n", program_name);
+"Usage: %s [-aAdeflnNOpqRStuvxX] [ -c count ] [ -C file_size ]\n", program_name);
        (void)fprintf(stderr,
 "\t\t[ -F file ] [ -i interface ] [ -r file ] [ -s snaplen ]\n");
        (void)fprintf(stderr,