X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/fe4ef2d22bcc1b89f16c30480f7bff4348d1a014..64e8f9a9ed91a3cbfa8e66367f87ef50a1d62b99:/print-ascii.c?ds=inline

diff --git a/print-ascii.c b/print-ascii.c
index bd87f6ac..237cf636 100644
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -43,8 +43,11 @@
 #endif
 
 #include "netdissect-stdinc.h"
+
 #include <stdio.h>
 
+#include "netdissect-ctype.h"
+
 #include "netdissect.h"
 #include "extract.h"
 
@@ -55,6 +58,8 @@
 #define HEXDUMP_HEXSTUFF_PER_LINE \
 		(HEXDUMP_HEXSTUFF_PER_SHORT * HEXDUMP_SHORTS_PER_LINE)
 
+static void hex_and_ascii_print_with_offset(netdissect_options *, const char *, const u_char *, u_int, u_int);
+
 void
 ascii_print(netdissect_options *ndo,
             const u_char *cp, u_int length)
@@ -62,12 +67,13 @@ ascii_print(netdissect_options *ndo,
 	u_int caplength;
 	u_char s;
 
-	caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
+	ndo->ndo_protocol = "ascii";
+	caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0;
 	if (length > caplength)
 		length = caplength;
 	ND_PRINT("\n");
 	while (length > 0) {
-		s = EXTRACT_U_1(cp);
+		s = GET_U_1(cp);
 		cp++;
 		length--;
 		if (s == '\r') {
@@ -80,10 +86,10 @@ ascii_print(netdissect_options *ndo,
 			 *
 			 * In the middle of a line, just print a '.'.
 			 */
-			if (length > 1 && EXTRACT_U_1(cp) != '\n')
+			if (length > 1 && GET_U_1(cp) != '\n')
 				ND_PRINT(".");
 		} else {
-			if (!ND_ISGRAPH(s) &&
+			if (!ND_ASCII_ISGRAPH(s) &&
 			    (s != '\t' && s != ' ' && s != '\n'))
 				ND_PRINT(".");
 			else
@@ -92,33 +98,33 @@ ascii_print(netdissect_options *ndo,
 	}
 }
 
-void
+static void
 hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident,
     const u_char *cp, u_int length, u_int oset)
 {
 	u_int caplength;
 	u_int i;
-	int s1, s2;
-	int nshorts;
+	u_int s1, s2;
+	u_int nshorts;
 	char hexstuff[HEXDUMP_SHORTS_PER_LINE*HEXDUMP_HEXSTUFF_PER_SHORT+1], *hsp;
 	char asciistuff[ASCII_LINELENGTH+1], *asp;
 
-	caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
+	caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0;
 	if (length > caplength)
 		length = caplength;
 	nshorts = length / sizeof(u_short);
 	i = 0;
 	hsp = hexstuff; asp = asciistuff;
-	while (--nshorts >= 0) {
-		s1 = EXTRACT_U_1(cp);
+	while (nshorts != 0) {
+		s1 = GET_U_1(cp);
 		cp++;
-		s2 = EXTRACT_U_1(cp);
+		s2 = GET_U_1(cp);
 		cp++;
 		(void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
 		    " %02x%02x", s1, s2);
 		hsp += HEXDUMP_HEXSTUFF_PER_SHORT;
-		*(asp++) = (ND_ISGRAPH(s1) ? s1 : '.');
-		*(asp++) = (ND_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';
@@ -128,14 +134,15 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident,
 			i = 0; hsp = hexstuff; asp = asciistuff;
 			oset += HEXDUMP_BYTES_PER_LINE;
 		}
+		nshorts--;
 	}
 	if (length & 1) {
-		s1 = EXTRACT_U_1(cp);
+		s1 = GET_U_1(cp);
 		cp++;
 		(void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
 		    " %02x", s1);
 		hsp += 3;
-		*(asp++) = (ND_ISGRAPH(s1) ? s1 : '.');
+		*(asp++) = (char)(ND_ASCII_ISGRAPH(s1) ? s1 : '.');
 		++i;
 	}
 	if (i > 0) {
@@ -163,27 +170,28 @@ hex_print_with_offset(netdissect_options *ndo,
 {
 	u_int caplength;
 	u_int i, s;
-	int nshorts;
+	u_int nshorts;
 
-	caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
+	caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0;
 	if (length > caplength)
 		length = caplength;
-	nshorts = (u_int) length / sizeof(u_short);
+	nshorts = length / sizeof(u_short);
 	i = 0;
-	while (--nshorts >= 0) {
+	while (nshorts != 0) {
 		if ((i++ % 8) == 0) {
 			ND_PRINT("%s0x%04x: ", ident, oset);
 			oset += HEXDUMP_BYTES_PER_LINE;
 		}
-		s = EXTRACT_U_1(cp);
+		s = GET_U_1(cp);
 		cp++;
-		ND_PRINT(" %02x%02x", s, EXTRACT_U_1(cp));
+		ND_PRINT(" %02x%02x", s, GET_U_1(cp));
 		cp++;
+		nshorts--;
 	}
 	if (length & 1) {
 		if ((i % 8) == 0)
 			ND_PRINT("%s0x%04x: ", ident, oset);
-		ND_PRINT(" %02x", EXTRACT_U_1(cp));
+		ND_PRINT(" %02x", GET_U_1(cp));
 	}
 }