X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ad7a38341c19e71e3595c17368ac18f08b71482d..HEAD:/print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index c672ca8c..f504d2f7 100644
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print-ascii.c,v 1.1 1999/09/30 14:49:12 sjg Exp $ 	*/
+/*	$NetBSD: print-ascii.c,v 1.1 1999/09/30 14:49:12 sjg Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -36,18 +36,18 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* \summary: ASCII packet dump printer */
+
+#include <config.h>
+
+#include "netdissect-stdinc.h"
 
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.17 2005-07-06 20:53:32 guy Exp $";
-#endif
-#include <tcpdump-stdinc.h>
 #include <stdio.h>
 
+#include "netdissect-ctype.h"
+
 #include "netdissect.h"
+#include "extract.h"
 
 #define ASCII_LINELENGTH 300
 #define HEXDUMP_BYTES_PER_LINE 16
@@ -57,74 +57,113 @@ static const char rcsid[] _U_ =
 		(HEXDUMP_HEXSTUFF_PER_SHORT * HEXDUMP_SHORTS_PER_LINE)
 
 void
-ascii_print(register const u_char *cp, register u_int length)
+ascii_print(netdissect_options *ndo,
+            const u_char *cp, u_int length)
 {
-	register int s;
+	u_int caplength;
+	u_char s;
+	int truncated = FALSE;
 
-	putchar('\n');
-	while (length > 0) {
-		s = *cp++;
+	ndo->ndo_protocol = "ascii";
+	caplength = ND_BYTES_AVAILABLE_AFTER(cp);
+	if (length > caplength) {
+		length = caplength;
+		truncated = TRUE;
+	}
+	ND_PRINT("\n");
+	while (length != 0) {
+		s = GET_U_1(cp);
+		cp++;
 		length--;
-		if (!isgraph(s) &&
-		    (s != '\t' && s != ' ' && s != '\n' && s != '\r'))
-			putchar('.');
-		else
-			putchar(s);
+		if (s == '\r') {
+			/*
+			 * Don't print CRs at the end of the line; they
+			 * don't belong at the ends of lines on UN*X,
+			 * and the standard I/O library will give us one
+			 * on Windows so we don't need to print one
+			 * ourselves.
+			 *
+			 * In the middle of a line, just print a '.'.
+			 */
+			if (length > 1 && GET_U_1(cp) != '\n')
+				ND_PRINT(".");
+		} else {
+			if (!ND_ASCII_ISGRAPH(s) &&
+			    (s != '\t' && s != ' ' && s != '\n'))
+				ND_PRINT(".");
+			else
+				ND_PRINT("%c", s);
+		}
 	}
+	if (truncated)
+		nd_trunc_longjmp(ndo);
 }
 
-void
-hex_and_ascii_print_with_offset(register const char *ident,
-    register const u_char *cp, register u_int length, register u_int oset)
+static void
+hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *indent,
+				const u_char *cp, u_int length, u_int offset)
 {
-	register u_int i;
-	register int s1, s2;
-	register int nshorts;
+	u_int caplength;
+	u_int i;
+	u_int s1, s2;
+	u_int nshorts;
+	int truncated = FALSE;
 	char hexstuff[HEXDUMP_SHORTS_PER_LINE*HEXDUMP_HEXSTUFF_PER_SHORT+1], *hsp;
 	char asciistuff[ASCII_LINELENGTH+1], *asp;
 
+	caplength = ND_BYTES_AVAILABLE_AFTER(cp);
+	if (length > caplength) {
+		length = caplength;
+		truncated = TRUE;
+	}
 	nshorts = length / sizeof(u_short);
 	i = 0;
 	hsp = hexstuff; asp = asciistuff;
-	while (--nshorts >= 0) {
-		s1 = *cp++;
-		s2 = *cp++;
+	while (nshorts != 0) {
+		s1 = GET_U_1(cp);
+		cp++;
+		s2 = GET_U_1(cp);
+		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 : '.');
+		*(asp++) = (char)(ND_ASCII_ISGRAPH(s1) ? s1 : '.');
+		*(asp++) = (char)(ND_ASCII_ISGRAPH(s2) ? s2 : '.');
 		i++;
 		if (i >= HEXDUMP_SHORTS_PER_LINE) {
 			*hsp = *asp = '\0';
-			(void)printf("%s0x%04x: %-*s  %s",
-			    ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
+			ND_PRINT("%s0x%04x: %-*s  %s",
+			    indent, offset, HEXDUMP_HEXSTUFF_PER_LINE,
 			    hexstuff, asciistuff);
 			i = 0; hsp = hexstuff; asp = asciistuff;
-			oset += HEXDUMP_BYTES_PER_LINE;
+			offset += HEXDUMP_BYTES_PER_LINE;
 		}
+		nshorts--;
 	}
 	if (length & 1) {
-		s1 = *cp++;
+		s1 = GET_U_1(cp);
+		cp++;
 		(void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
 		    " %02x", s1);
 		hsp += 3;
-		*(asp++) = (isgraph(s1) ? s1 : '.');
+		*(asp++) = (char)(ND_ASCII_ISGRAPH(s1) ? s1 : '.');
 		++i;
 	}
 	if (i > 0) {
 		*hsp = *asp = '\0';
-		(void)printf("%s0x%04x: %-*s  %s",
-		     ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
+		ND_PRINT("%s0x%04x: %-*s  %s",
+		     indent, offset, HEXDUMP_HEXSTUFF_PER_LINE,
 		     hexstuff, asciistuff);
 	}
+	if (truncated)
+		nd_trunc_longjmp(ndo);
 }
 
 void
-hex_and_ascii_print(register const char *ident, register const u_char *cp,
-    register u_int length)
+hex_and_ascii_print(netdissect_options *ndo, const char *indent,
+		    const u_char *cp, u_int length)
 {
-	hex_and_ascii_print_with_offset(ident, cp, length, 0);
+	hex_and_ascii_print_with_offset(ndo, indent, cp, length, 0);
 }
 
 /*
@@ -132,53 +171,44 @@ hex_and_ascii_print(register const char *ident, register const u_char *cp,
  */
 void
 hex_print_with_offset(netdissect_options *ndo,
-                      const char *ident, const u_char *cp, u_int length,
-		      u_int oset)
+                      const char *indent, const u_char *cp, u_int length,
+		      u_int offset)
 {
-	register u_int i, s;
-	register int nshorts;
+	u_int caplength;
+	u_int i, s;
+	u_int nshorts;
+	int truncated = FALSE;
 
-	nshorts = (u_int) length / sizeof(u_short);
+	caplength = ND_BYTES_AVAILABLE_AFTER(cp);
+	if (length > caplength) {
+		length = caplength;
+		truncated = TRUE;
+	}
+	nshorts = length / sizeof(u_short);
 	i = 0;
-	while (--nshorts >= 0) {
+	while (nshorts != 0) {
 		if ((i++ % 8) == 0) {
-                  (void)ND_PRINT((ndo,"%s0x%04x: ", ident, oset));
-                  oset += HEXDUMP_BYTES_PER_LINE;
+			ND_PRINT("%s0x%04x: ", indent, offset);
+			offset += HEXDUMP_BYTES_PER_LINE;
 		}
-		s = *cp++;
-		(void)ND_PRINT((ndo," %02x%02x", s, *cp++));
+		s = GET_U_1(cp);
+		cp++;
+		ND_PRINT(" %02x%02x", s, GET_U_1(cp));
+		cp++;
+		nshorts--;
 	}
 	if (length & 1) {
 		if ((i % 8) == 0)
-                  (void)ND_PRINT((ndo,"%s0x%04x: ", ident, oset));
-		(void)ND_PRINT((ndo," %02x", *cp));
+			ND_PRINT("%s0x%04x: ", indent, offset);
+		ND_PRINT(" %02x", GET_U_1(cp));
 	}
+	if (truncated)
+		nd_trunc_longjmp(ndo);
 }
 
-/*
- * just for completeness
- */
 void
-hex_print(netdissect_options *ndo,const char *ident, const u_char *cp, u_int length)
-{
-  hex_print_with_offset(ndo, ident, cp, length, 0);
-}
-
-#ifdef MAIN
-int
-main(int argc, char *argv[])
+hex_print(netdissect_options *ndo,
+	  const char *indent, const u_char *cp, u_int length)
 {
-	hex_print("\n\t", "Hello, World!\n", 14);
-	printf("\n");
-	hex_and_ascii_print("\n\t", "Hello, World!\n", 14);
-	printf("\n");
-	ascii_print("Hello, World!\n", 14);
-	printf("\n");
-#define TMSG "Now is the winter of our discontent...\n"
-	hex_print_with_offset("\n\t", TMSG, sizeof(TMSG) - 1, 0x100);
-	printf("\n");
-	hex_and_ascii_print_with_offset("\n\t", TMSG, sizeof(TMSG) - 1, 0x100);
-	printf("\n");
-	exit(0);
+	hex_print_with_offset(ndo, indent, cp, length, 0);
 }
-#endif /* MAIN */