X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/fb2479d733dbe8a991d11909b319341f7db62ab1..1dbc62cb8386ef2ebc636b83db8a1ba7deeda7dd:/print-ascii.c?ds=sidebyside

diff --git a/print-ascii.c b/print-ascii.c
index 812e7677..8c12b4fd 100644
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -55,6 +55,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,7 +64,8 @@ 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) ? ndo->ndo_snapend - cp : 0;
 	if (length > caplength)
 		length = caplength;
 	ND_PRINT("\n");
@@ -92,7 +95,7 @@ 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)
 {
@@ -103,16 +106,18 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident,
 	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) ? ndo->ndo_snapend - cp : 0;
 	if (length > caplength)
 		length = caplength;
 	nshorts = length / sizeof(u_short);
 	i = 0;
 	hsp = hexstuff; asp = asciistuff;
 	while (--nshorts >= 0) {
-		s1 = *cp++;
-		s2 = *cp++;
-		(void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
+		s1 = EXTRACT_U_1(cp);
+		cp++;
+		s2 = EXTRACT_U_1(cp);
+		cp++;
+		(void)nd_snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
 		    " %02x%02x", s1, s2);
 		hsp += HEXDUMP_HEXSTUFF_PER_SHORT;
 		*(asp++) = (ND_ISGRAPH(s1) ? s1 : '.');
@@ -128,8 +133,9 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident,
 		}
 	}
 	if (length & 1) {
-		s1 = *cp++;
-		(void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
+		s1 = EXTRACT_U_1(cp);
+		cp++;
+		(void)nd_snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
 		    " %02x", s1);
 		hsp += 3;
 		*(asp++) = (ND_ISGRAPH(s1) ? s1 : '.');
@@ -162,7 +168,7 @@ hex_print_with_offset(netdissect_options *ndo,
 	u_int i, s;
 	int nshorts;
 
-	caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
+	caplength = (ndo->ndo_snapend > cp) ? ndo->ndo_snapend - cp : 0;
 	if (length > caplength)
 		length = caplength;
 	nshorts = (u_int) length / sizeof(u_short);
@@ -172,13 +178,15 @@ hex_print_with_offset(netdissect_options *ndo,
 			ND_PRINT("%s0x%04x: ", ident, oset);
 			oset += HEXDUMP_BYTES_PER_LINE;
 		}
-		s = *cp++;
-		ND_PRINT(" %02x%02x", s, *cp++);
+		s = EXTRACT_U_1(cp);
+		cp++;
+		ND_PRINT(" %02x%02x", s, EXTRACT_U_1(cp));
+		cp++;
 	}
 	if (length & 1) {
 		if ((i % 8) == 0)
 			ND_PRINT("%s0x%04x: ", ident, oset);
-		ND_PRINT(" %02x", *cp);
+		ND_PRINT(" %02x", EXTRACT_U_1(cp));
 	}
 }