Make "-x" and "-X" work with PPPoE interfaces; based on code from Darren

[tcpdump] / print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index 6a6b845a95f9428b6b947f44891953fdbe61561d..14616aae9b7187fde40a691a3ad2fcf6c945427e 100644 (file)
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -40,11 +40,9 @@
 #include "config.h"
 #endif
 
-#include <sys/cdefs.h>
-#if 0
 #ifndef lint
-__RCSID("$NetBSD: print-ascii.c,v 1.1 1999/09/30 14:49:12 sjg Exp $");
-#endif
+static const char rcsid[] =
+     "@(#) $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>
@@ -52,6 +50,7 @@ __RCSID("$NetBSD: print-ascii.c,v 1.1 1999/09/30 14:49:12 sjg Exp $");
 
 #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 */
@@ -66,39 +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)sprintf(hsp, " %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)sprintf(hsp, " %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);
+               }
        }
 }