X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/f274a23dc1767eca8f4c433f6bd11ac5dbf4f31e..5cea2703185c6af1616dc338c43c6cf67b0bec60:/print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index f83d401a..14e50bd5 100644
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -36,15 +36,17 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: ASCII packet dump printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 #include <stdio.h>
 
-#include "interface.h"
+#include "netdissect.h"
+#include "extract.h"
 
 #define ASCII_LINELENGTH 300
 #define HEXDUMP_BYTES_PER_LINE 16
@@ -55,13 +57,18 @@
 
 void
 ascii_print(netdissect_options *ndo,
-            register const u_char *cp, register u_int length)
+            const u_char *cp, u_int length)
 {
-	register u_char s;
+	u_int caplength;
+	u_char s;
 
+	caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
+	if (length > caplength)
+		length = caplength;
 	ND_PRINT((ndo, "\n"));
 	while (length > 0) {
-		s = *cp++;
+		s = EXTRACT_U_1(cp);
+		cp++;
 		length--;
 		if (s == '\r') {
 			/*
@@ -73,7 +80,7 @@ ascii_print(netdissect_options *ndo,
 			 *
 			 * In the middle of a line, just print a '.'.
 			 */
-			if (length > 1 && *cp != '\n')
+			if (length > 1 && EXTRACT_U_1(cp) != '\n')
 				ND_PRINT((ndo, "."));
 		} else {
 			if (!ND_ISGRAPH(s) &&
@@ -86,15 +93,19 @@ ascii_print(netdissect_options *ndo,
 }
 
 void
-hex_and_ascii_print_with_offset(netdissect_options *ndo, register const char *ident,
-    register const u_char *cp, register u_int length, register u_int oset)
+hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident,
+    const u_char *cp, u_int length, u_int oset)
 {
-	register u_int i;
-	register int s1, s2;
-	register int nshorts;
+	u_int caplength;
+	u_int i;
+	int s1, s2;
+	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;
+	if (length > caplength)
+		length = caplength;
 	nshorts = length / sizeof(u_short);
 	i = 0;
 	hsp = hexstuff; asp = asciistuff;
@@ -133,8 +144,8 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, register const char *id
 }
 
 void
-hex_and_ascii_print(netdissect_options *ndo, register const char *ident,
-    register const u_char *cp, register u_int length)
+hex_and_ascii_print(netdissect_options *ndo, const char *ident,
+    const u_char *cp, u_int length)
 {
 	hex_and_ascii_print_with_offset(ndo, ident, cp, length, 0);
 }
@@ -147,9 +158,13 @@ hex_print_with_offset(netdissect_options *ndo,
                       const char *ident, const u_char *cp, u_int length,
 		      u_int oset)
 {
-	register u_int i, s;
-	register int nshorts;
+	u_int caplength;
+	u_int i, s;
+	int nshorts;
 
+	caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
+	if (length > caplength)
+		length = caplength;
 	nshorts = (u_int) length / sizeof(u_short);
 	i = 0;
 	while (--nshorts >= 0) {