From Albert Chin: handle systems that don't support IPv6.

[tcpdump] / print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index 405621b461845af976f9b4f02a526ebb5d91e96d..1b8948501338c7af78a1f96de52c0de3cda8c284 100644 (file)
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -41,12 +41,11 @@
 #endif
 
 #ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.8 2002-06-11 17:08:42 itojun Exp $";
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.16 2004-07-21 22:00:10 guy Exp $";
 #endif
+#include <tcpdump-stdinc.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <ctype.h>
 
 #include "interface.h"
 
@@ -58,7 +57,7 @@ static const char rcsid[] =
                (HEXDUMP_HEXSTUFF_PER_SHORT * HEXDUMP_SHORTS_PER_LINE)
 
 void
-ascii_print_with_offset(register const u_char *cp, register u_int length,
+ascii_print_with_offset(register const char *ident, register const u_char *cp, register u_int length,
                        register u_int oset)
 {
        register u_int i;
@@ -66,7 +65,7 @@ ascii_print_with_offset(register const u_char *cp, register u_int length,
        register int nshorts;
        char hexstuff[HEXDUMP_SHORTS_PER_LINE*HEXDUMP_HEXSTUFF_PER_SHORT+1], *hsp;
        char asciistuff[ASCII_LINELENGTH+1], *asp;
-       int maxlength = (Aflag ? ASCII_LINELENGTH : HEXDUMP_SHORTS_PER_LINE);
+       u_int maxlength = (Aflag ? ASCII_LINELENGTH : HEXDUMP_SHORTS_PER_LINE);
 
        nshorts = length / sizeof(u_short);
        i = 0;
@@ -94,8 +93,8 @@ ascii_print_with_offset(register const u_char *cp, register u_int length,
                        if (Aflag) {
                                (void)printf("%s", asciistuff);
                        } else {
-                               (void)printf("\n0x%04x\t%-*s\t%s",
-                                   oset, HEXDUMP_HEXSTUFF_PER_LINE,
+                               (void)printf("%s0x%04x: %-*s  %s",
+                                   ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
                                    hexstuff, asciistuff);
                        }
                        i = 0; hsp = hexstuff; asp = asciistuff;
@@ -117,26 +116,26 @@ ascii_print_with_offset(register const u_char *cp, register u_int length,
        if (i > 0) {
                *hsp = *asp = '\0';
                if (Aflag) {
-                       (void)printf("\n%s", asciistuff);
+                       (void)printf("%s%s", ident, asciistuff);
                } else {
-                       (void)printf("\n0x%04x\t%-*s\t%s",
-                            oset, HEXDUMP_HEXSTUFF_PER_LINE,
+                       (void)printf("%s0x%04x: %-*s  %s",
+                            ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
                             hexstuff, asciistuff);
                }
        }
 }
 
 void
-ascii_print(register const u_char *cp, register u_int length)
+ascii_print(register const char *ident, register const u_char *cp, register u_int length)
 {
-       ascii_print_with_offset(cp, length, 0);
+       ascii_print_with_offset(ident, cp, length, 0);
 }
 
 /*
  * telnet_print() wants this.  It is essentially default_print_unaligned()
  */
 void
-hex_print_with_offset(register const u_char *cp, register u_int length,
+hex_print_with_offset(register const char *ident, register const u_char *cp, register u_int length,
                      register u_int oset)
 {
        register u_int i, s;
@@ -146,7 +145,7 @@ hex_print_with_offset(register const u_char *cp, register u_int length,
        i = 0;
        while (--nshorts >= 0) {
                if ((i++ % 8) == 0) {
-                       (void)printf("\n0x%04x\t", oset);
+                       (void)printf("%s0x%04x: ", ident, oset);
                        oset += HEXDUMP_BYTES_PER_LINE;
                }
                s = *cp++;
@@ -154,7 +153,7 @@ hex_print_with_offset(register const u_char *cp, register u_int length,
        }
        if (length & 1) {
                if ((i % 8) == 0)
-                       (void)printf("\n0x%04x\t", oset);
+                       (void)printf("%s0x%04x: ", ident, oset);
                (void)printf(" %02x", *cp);
        }
 }
@@ -163,9 +162,9 @@ hex_print_with_offset(register const u_char *cp, register u_int length,
  * just for completeness
  */
 void
-hex_print(register const u_char *cp, register u_int length)
+hex_print(register const char *ident, register const u_char *cp, register u_int length)
 {
-       hex_print_with_offset(cp, length, 0);
+       hex_print_with_offset(ident, cp, length, 0);
 }
 
 #ifdef MAIN
@@ -182,3 +181,5 @@ main(int argc, char *argv[])
        exit(0);
 }
 #endif /* MAIN */
+
+