X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/e2982e7f6f0b624a773ec5a58885ee80fab46d34..3e3e6d2ef4c1b120077378fe32dc0a88ee81f38e:/print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index 27ecc2e2..78bced6a 100644
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -39,10 +39,10 @@
 /* \summary: ASCII packet dump printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 #include <stdio.h>
 
 #include "netdissect.h"
@@ -62,6 +62,7 @@ ascii_print(netdissect_options *ndo,
 	u_int caplength;
 	u_char s;
 
+	ndo->ndo_protocol = "ascii";
 	caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
 	if (length > caplength)
 		length = caplength;
@@ -110,9 +111,11 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident,
 	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 +131,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 : '.');
@@ -172,13 +176,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));
 	}
 }