X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b46194277a029332c9d1b0ba38110cabc179210f..refs/pull/482/head:/print-tftp.c

diff --git a/print-tftp.c b/print-tftp.c
index 5f47d476..e7201ebd 100644
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -21,16 +21,15 @@
  * Format and print trivial file transfer protocol packets.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 /*
@@ -131,12 +130,12 @@ tftp_print(netdissect_options *ndo,
 	case RRQ:
 	case WRQ:
 	case OACK:
-		p = (u_char *)tp->th_stuff;
+		p = (const u_char *)tp->th_stuff;
 		ND_PRINT((ndo, " "));
 		/* Print filename or first option */
 		if (opcode != OACK)
 			ND_PRINT((ndo, "\""));
-		i = fn_print(p, ndo->ndo_snapend);
+		i = fn_print(ndo, p, ndo->ndo_snapend);
 		if (opcode != OACK)
 			ND_PRINT((ndo, "\""));
 
@@ -147,7 +146,7 @@ tftp_print(netdissect_options *ndo,
 			p++;
 			if (*p != '\0') {
 				ND_PRINT((ndo, " "));
-				fn_print(p, ndo->ndo_snapend);
+				fn_print(ndo, p, ndo->ndo_snapend);
 			}
 		}
 
@@ -167,7 +166,7 @@ tftp_print(netdissect_options *ndo,
 		ND_PRINT((ndo, " %s \"", tok2str(err2str, "tftp-err-#%d \"",
 				       EXTRACT_16BITS(&tp->th_code))));
 		/* Print error message string */
-		i = fn_print((const u_char *)tp->th_data, ndo->ndo_snapend);
+		i = fn_print(ndo, (const u_char *)tp->th_data, ndo->ndo_snapend);
 		ND_PRINT((ndo, "\""));
 		if (i)
 			goto trunc;