X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/64677b0d78ff168d98c3035e894c4910c021136e..299fc72fea7a32b18a77457c70028e9679fd5c0d:/print-tftp.c

diff --git a/print-tftp.c b/print-tftp.c
index d3a9ef70..2630e554 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[] = {
@@ -95,6 +94,7 @@ tftp_print(netdissect_options *ndo,
 	u_int opcode;
 	u_int ui;
 
+	ndo->ndo_protocol = "tftp";
 	/* Print length */
 	ND_PRINT(" %u", length);
 
@@ -120,7 +120,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 +131,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;
@@ -142,7 +142,7 @@ tftp_print(netdissect_options *ndo,
 			ND_TCHECK_1(bp);
 			if (EXTRACT_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;
@@ -156,7 +156,7 @@ tftp_print(netdissect_options *ndo,
 			ND_TCHECK_1(bp);
 			if (EXTRACT_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;
@@ -185,7 +185,7 @@ tftp_print(netdissect_options *ndo,
 		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;
@@ -198,6 +198,6 @@ tftp_print(netdissect_options *ndo,
 	}
 	return;
 trunc:
-	ND_PRINT("%s", tstr);
+	nd_print_trunc(ndo);
 	return;
 }