X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/f910e26813207a9c42fd5e59a0f29cd68afcd95d..c0af6af3011d4c55bdadf3dd76cd5fc1115c50d0:/print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index 34640b4f..df3f36a1 100644
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -36,18 +36,17 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* \summary: ASCII packet dump printer */
+
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.13 2003-12-29 10:30:40 hannes Exp $";
-#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
@@ -56,105 +55,140 @@ static const char rcsid[] _U_ =
 #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_with_offset(register const u_char *ident, register const u_char *cp, register u_int length,
-			register u_int oset)
+ascii_print(netdissect_options *ndo,
+            const u_char *cp, u_int length)
 {
-	register u_int i;
-	register int s1, s2;
-	register int nshorts;
+	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;
+	ND_PRINT("\n");
+	while (length > 0) {
+		s = EXTRACT_U_1(cp);
+		cp++;
+		length--;
+		if (s == '\r') {
+			/*
+			 * Don't print CRs at the end of the line; they
+			 * don't belong at the ends of lines on UN*X,
+			 * and the standard I/O library will give us one
+			 * on Windows so we don't need to print one
+			 * ourselves.
+			 *
+			 * In the middle of a line, just print a '.'.
+			 */
+			if (length > 1 && EXTRACT_U_1(cp) != '\n')
+				ND_PRINT(".");
+		} else {
+			if (!ND_ISGRAPH(s) &&
+			    (s != '\t' && s != ' ' && s != '\n'))
+				ND_PRINT(".");
+			else
+				ND_PRINT("%c", s);
+		}
+	}
+}
+
+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;
+	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;
-	u_int maxlength = (Aflag ? ASCII_LINELENGTH : HEXDUMP_SHORTS_PER_LINE);
 
+	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;
-	if (Aflag) *(asp++) = '\n';
-	while (--nshorts >= 0) {
-		s1 = *cp++;
-		s2 = *cp++;
-		if (Aflag) {
-			i += 2;
-			*(asp++) = (isgraph(s1) ? s1 : (s1 != '\t' && s1 != ' ' && s1 != '\n' && s1 != '\r' ? '.' : s1) );
-			*(asp++) = (isgraph(s2) ? s2 : (s2 != '\t' && s2 != ' ' && s2 != '\n' && s2 != '\r' ? '.' : s2) );
-			if (s1 == '\n' || s2 == '\n') i = maxlength;
-
-		} else {
-			(void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
-			    " %02x%02x", s1, s2);
-			hsp += HEXDUMP_HEXSTUFF_PER_SHORT;
-			*(asp++) = (isgraph(s1) ? s1 : '.');
-			*(asp++) = (isgraph(s2) ? s2 : '.');
-			i++;
-		}
-		if (i >= maxlength) {
+	while (nshorts != 0) {
+		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++) = (char)(ND_ISGRAPH(s1) ? s1 : '.');
+		*(asp++) = (char)(ND_ISGRAPH(s2) ? s2 : '.');
+		i++;
+		if (i >= HEXDUMP_SHORTS_PER_LINE) {
 			*hsp = *asp = '\0';
-			if (Aflag) {
-				(void)printf("%s", asciistuff);
-			} else {
-				(void)printf("%s0x%04x:\t%-*s\t%s",
-				    ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
-				    hexstuff, asciistuff);
-			}
+			ND_PRINT("%s0x%04x: %-*s  %s",
+			    ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
+			    hexstuff, asciistuff);
 			i = 0; hsp = hexstuff; asp = asciistuff;
 			oset += HEXDUMP_BYTES_PER_LINE;
 		}
+		nshorts--;
 	}
 	if (length & 1) {
-		s1 = *cp++;
-		if (Aflag) {
-			*(asp++) = (isgraph(s1) ? s1 : (s1 != '\t' && s1 != ' ' && s1 != '\n' && s1 != '\r' ? '.' : s1) );
-		} else {
-			(void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
-			    " %02x", s1);
-			hsp += 3;
-			*(asp++) = (isgraph(s1) ? s1 : '.');
-		}
+		s1 = EXTRACT_U_1(cp);
+		cp++;
+		(void)nd_snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
+		    " %02x", s1);
+		hsp += 3;
+		*(asp++) = (char)(ND_ISGRAPH(s1) ? s1 : '.');
 		++i;
 	}
 	if (i > 0) {
 		*hsp = *asp = '\0';
-		if (Aflag) {
-			(void)printf("%s%s", ident, asciistuff);
-		} else {
-			(void)printf("%s0x%04x:\t%-*s\t%s",
-			     ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
-			     hexstuff, asciistuff);
-		}
+		ND_PRINT("%s0x%04x: %-*s  %s",
+		     ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
+		     hexstuff, asciistuff);
 	}
 }
 
 void
-ascii_print(register const u_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)
 {
-	ascii_print_with_offset(ident, cp, length, 0);
+	hex_and_ascii_print_with_offset(ndo, ident, cp, length, 0);
 }
 
 /*
  * telnet_print() wants this.  It is essentially default_print_unaligned()
  */
 void
-hex_print_with_offset(register const u_char *cp, register u_int length,
-		      register u_int oset)
+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;
+	u_int nshorts;
 
-	nshorts = (u_int) length / sizeof(u_short);
+	caplength = (ndo->ndo_snapend > cp) ? ndo->ndo_snapend - cp : 0;
+	if (length > caplength)
+		length = caplength;
+	nshorts = length / sizeof(u_short);
 	i = 0;
-	while (--nshorts >= 0) {
+	while (nshorts != 0) {
 		if ((i++ % 8) == 0) {
-			(void)printf("\n0x%04x\t", oset);
+			ND_PRINT("%s0x%04x: ", ident, oset);
 			oset += HEXDUMP_BYTES_PER_LINE;
 		}
-		s = *cp++;
-		(void)printf(" %02x%02x", s, *cp++);
+		s = EXTRACT_U_1(cp);
+		cp++;
+		ND_PRINT(" %02x%02x", s, EXTRACT_U_1(cp));
+		cp++;
+		nshorts--;
 	}
 	if (length & 1) {
 		if ((i % 8) == 0)
-			(void)printf("\n0x%04x\t", oset);
-		(void)printf(" %02x", *cp);
+			ND_PRINT("%s0x%04x: ", ident, oset);
+		ND_PRINT(" %02x", EXTRACT_U_1(cp));
 	}
 }
 
@@ -162,24 +196,26 @@ hex_print_with_offset(register const u_char *cp, register u_int length,
  * just for completeness
  */
 void
-hex_print(register const u_char *cp, register u_int length)
+hex_print(netdissect_options *ndo,const char *ident, const u_char *cp, u_int length)
 {
-	hex_print_with_offset(cp, length, 0);
+  hex_print_with_offset(ndo, ident, cp, length, 0);
 }
 
 #ifdef MAIN
 int
 main(int argc, char *argv[])
 {
-	hex_print("Hello, World!\n", 14);
+	hex_print("\n\t", "Hello, World!\n", 14);
+	printf("\n");
+	hex_and_ascii_print("\n\t", "Hello, World!\n", 14);
 	printf("\n");
 	ascii_print("Hello, World!\n", 14);
 	printf("\n");
 #define TMSG "Now is the winter of our discontent...\n"
-	ascii_print_with_offset(TMSG, sizeof(TMSG) - 1, 0x100);
+	hex_print_with_offset("\n\t", TMSG, sizeof(TMSG) - 1, 0x100);
+	printf("\n");
+	hex_and_ascii_print_with_offset("\n\t", TMSG, sizeof(TMSG) - 1, 0x100);
 	printf("\n");
 	exit(0);
 }
 #endif /* MAIN */
-
-