X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/6b004c4e263adab464db0970024a5948f0d41de3..da20bc56d6100b5275d6f85c4a25bac1dab4e57e:/print-tftp.c

diff --git a/print-tftp.c b/print-tftp.c
index 6600c9cf..314dfb41 100644
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -101,8 +101,8 @@ tftp_print(netdissect_options *ndo,
 	/* Print tftp request type */
 	if (length < 2)
 		goto trunc;
-	ND_TCHECK_16BITS(bp);
-	opcode = EXTRACT_16BITS(bp);
+	ND_TCHECK_2(bp);
+	opcode = EXTRACT_BE_U_2(bp);
 	cp = tok2str(op2str, "tftp-#%d", opcode);
 	ND_PRINT((ndo, " %s", cp));
 	/* Bail if bogus opcode */
@@ -168,17 +168,17 @@ tftp_print(netdissect_options *ndo,
 	case DATA:
 		if (length < 2)
 			goto trunc;	/* no block number */
-		ND_TCHECK_16BITS(bp);
-		ND_PRINT((ndo, " block %d", EXTRACT_16BITS(bp)));
+		ND_TCHECK_2(bp);
+		ND_PRINT((ndo, " block %d", EXTRACT_BE_U_2(bp)));
 		break;
 
 	case TFTP_ERROR:
 		/* Print error code string */
 		if (length < 2)
 			goto trunc;	/* no error code */
-		ND_TCHECK_16BITS(bp);
+		ND_TCHECK_2(bp);
 		ND_PRINT((ndo, " %s", tok2str(err2str, "tftp-err-#%d \"",
-				       EXTRACT_16BITS(bp))));
+				       EXTRACT_BE_U_2(bp))));
 		bp += 2;
 		length -= 2;
 		/* Print error message string */