X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/d6af516cbc7c874404cb07456a6e80a8e9ddd9b4..c56f25c54b87b3edaced56578721c72d7ca9795d:/print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index 2f05c387..2e5812e4 100644
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -36,15 +36,17 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* \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 "netdissect.h"
-#include "interface.h"
+#include "extract.h"
 
 #define ASCII_LINELENGTH 300
 #define HEXDUMP_BYTES_PER_LINE 16
@@ -54,13 +56,19 @@
 		(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;
+	register u_char s;
 
-	putchar('\n');
+	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') {
 			/*
@@ -72,14 +80,14 @@ ascii_print(register const u_char *cp, register u_int length)
 			 *
 			 * In the middle of a line, just print a '.'.
 			 */
-			if (length > 1 && *cp != '\n')
-				putchar('.');
+			if (length > 1 && EXTRACT_U_1(cp) != '\n')
+				ND_PRINT((ndo, "."));
 		} else {
 			if (!ND_ISGRAPH(s) &&
 			    (s != '\t' && s != ' ' && s != '\n'))
-				putchar('.');
+				ND_PRINT((ndo, "."));
 			else
-				putchar(s);
+				ND_PRINT((ndo, "%c", s));
 		}
 	}
 }
@@ -88,12 +96,16 @@ 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)
 {
+	u_int caplength;
 	register u_int i;
 	register int s1, s2;
 	register 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;
@@ -146,9 +158,13 @@ hex_print_with_offset(netdissect_options *ndo,
                       const char *ident, const u_char *cp, u_int length,
 		      u_int oset)
 {
+	u_int caplength;
 	register u_int i, s;
 	register 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) {