X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/e2982e7f6f0b624a773ec5a58885ee80fab46d34..10ac80fdecfa9b9b7d259d8f50d0b72ef1b18f12:/print-tftp.c

diff --git a/print-tftp.c b/print-tftp.c
index 8c72d582..854564c4 100644
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -22,10 +22,10 @@
 /* \summary: Trivial File Transfer Protocol (TFTP) printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <string.h>
 
@@ -58,7 +58,6 @@
 #define	EEXISTS		6		/* file already exists */
 #define	ENOUSER		7		/* no such user */
 
-static const char tstr[] = " [|tftp]";
 
 /* op code to string mapping */
 static const struct tok op2str[] = {
@@ -92,19 +91,22 @@ tftp_print(netdissect_options *ndo,
            const u_char *bp, u_int length)
 {
 	const char *cp;
-	int opcode;
+	u_int opcode;
 	u_int ui;
 
+	ndo->ndo_protocol = "tftp";
+
+	/* Print protocol */
+	nd_print_protocol_caps(ndo);
 	/* Print length */
-	ND_PRINT(" %d", length);
+	ND_PRINT(", length %u", length);
 
 	/* Print tftp request type */
 	if (length < 2)
 		goto trunc;
-	ND_TCHECK_2(bp);
-	opcode = EXTRACT_BE_U_2(bp);
-	cp = tok2str(op2str, "tftp-#%d", opcode);
-	ND_PRINT(" %s", cp);
+	opcode = GET_BE_U_2(bp);
+	cp = tok2str(op2str, "tftp-#%u", opcode);
+	ND_PRINT(", %s", cp);
 	/* Bail if bogus opcode */
 	if (*cp == 't')
 		return;
@@ -120,7 +122,7 @@ tftp_print(netdissect_options *ndo,
 		ND_PRINT(" ");
 		/* Print filename */
 		ND_PRINT("\"");
-		ui = fn_printztn(ndo, bp, length, ndo->ndo_snapend);
+		ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
 		ND_PRINT("\"");
 		if (ui == 0)
 			goto trunc;
@@ -131,7 +133,7 @@ tftp_print(netdissect_options *ndo,
 		if (length == 0)
 			goto trunc;	/* no mode */
 		ND_PRINT(" ");
-		ui = fn_printztn(ndo, bp, length, ndo->ndo_snapend);
+		ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
 		if (ui == 0)
 			goto trunc;
 		bp += ui;
@@ -139,10 +141,9 @@ tftp_print(netdissect_options *ndo,
 
 		/* Print options, if any */
 		while (length != 0) {
-			ND_TCHECK_1(bp);
-			if (EXTRACT_U_1(bp) != '\0')
+			if (GET_U_1(bp) != '\0')
 				ND_PRINT(" ");
-			ui = fn_printztn(ndo, bp, length, ndo->ndo_snapend);
+			ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
 			if (ui == 0)
 				goto trunc;
 			bp += ui;
@@ -153,10 +154,9 @@ tftp_print(netdissect_options *ndo,
 	case OACK:
 		/* Print options */
 		while (length != 0) {
-			ND_TCHECK_1(bp);
-			if (EXTRACT_U_1(bp) != '\0')
+			if (GET_U_1(bp) != '\0')
 				ND_PRINT(" ");
-			ui = fn_printztn(ndo, bp, length, ndo->ndo_snapend);
+			ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
 			if (ui == 0)
 				goto trunc;
 			bp += ui;
@@ -168,24 +168,22 @@ tftp_print(netdissect_options *ndo,
 	case DATA:
 		if (length < 2)
 			goto trunc;	/* no block number */
-		ND_TCHECK_2(bp);
-		ND_PRINT(" block %d", EXTRACT_BE_U_2(bp));
+		ND_PRINT(" block %u", GET_BE_U_2(bp));
 		break;
 
 	case TFTP_ERROR:
 		/* Print error code string */
 		if (length < 2)
 			goto trunc;	/* no error code */
-		ND_TCHECK_2(bp);
-		ND_PRINT(" %s", tok2str(err2str, "tftp-err-#%d \"",
-				       EXTRACT_BE_U_2(bp)));
+		ND_PRINT(" %s", tok2str(err2str, "tftp-err-#%u \"",
+				       GET_BE_U_2(bp)));
 		bp += 2;
 		length -= 2;
 		/* Print error message string */
 		if (length == 0)
 			goto trunc;	/* no error message */
 		ND_PRINT(" \"");
-		ui = fn_printztn(ndo, bp, length, ndo->ndo_snapend);
+		ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
 		ND_PRINT("\"");
 		if (ui == 0)
 			goto trunc;
@@ -193,11 +191,10 @@ tftp_print(netdissect_options *ndo,
 
 	default:
 		/* We shouldn't get here */
-		ND_PRINT("(unknown #%d)", opcode);
+		ND_PRINT("(unknown #%u)", opcode);
 		break;
 	}
 	return;
 trunc:
-	ND_PRINT("%s", tstr);
-	return;
+	nd_print_trunc(ndo);
 }