Upgrade tcpdump to tcpdump-4.99.1
Test: make
Change-Id: I052ed8f5279c806e4d2ff925f581b71db3ac03c0
diff --git a/print-tftp.c b/print-tftp.c
index 6600c9c..39fc696 100644
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -22,12 +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 <string.h>
+#include "netdissect-stdinc.h"
#include "netdissect.h"
#include "extract.h"
@@ -58,7 +56,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[] = {
@@ -89,22 +86,25 @@
*/
void
tftp_print(netdissect_options *ndo,
- register const u_char *bp, u_int length)
+ const u_char *bp, u_int length)
{
- register const char *cp;
- register int opcode;
+ const char *cp;
+ u_int opcode;
u_int ui;
+ ndo->ndo_protocol = "tftp";
+
+ /* Print protocol */
+ nd_print_protocol_caps(ndo);
/* Print length */
- ND_PRINT((ndo, " %d", length));
+ ND_PRINT(", length %u", length);
/* Print tftp request type */
if (length < 2)
goto trunc;
- ND_TCHECK_16BITS(bp);
- opcode = EXTRACT_16BITS(bp);
- cp = tok2str(op2str, "tftp-#%d", opcode);
- ND_PRINT((ndo, " %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;
@@ -117,11 +117,11 @@
case WRQ:
if (length == 0)
goto trunc;
- ND_PRINT((ndo, " "));
+ ND_PRINT(" ");
/* Print filename */
- ND_PRINT((ndo, "\""));
- ui = fn_printztn(ndo, bp, length, ndo->ndo_snapend);
- ND_PRINT((ndo, "\""));
+ ND_PRINT("\"");
+ ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
+ ND_PRINT("\"");
if (ui == 0)
goto trunc;
bp += ui;
@@ -130,8 +130,8 @@
/* Print the mode - RRQ and WRQ only */
if (length == 0)
goto trunc; /* no mode */
- ND_PRINT((ndo, " "));
- ui = fn_printztn(ndo, bp, length, ndo->ndo_snapend);
+ ND_PRINT(" ");
+ ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
if (ui == 0)
goto trunc;
bp += ui;
@@ -139,10 +139,9 @@
/* Print options, if any */
while (length != 0) {
- ND_TCHECK(*bp);
- if (*bp != '\0')
- ND_PRINT((ndo, " "));
- ui = fn_printztn(ndo, bp, length, ndo->ndo_snapend);
+ if (GET_U_1(bp) != '\0')
+ ND_PRINT(" ");
+ ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
if (ui == 0)
goto trunc;
bp += ui;
@@ -153,10 +152,9 @@
case OACK:
/* Print options */
while (length != 0) {
- ND_TCHECK(*bp);
- if (*bp != '\0')
- ND_PRINT((ndo, " "));
- ui = fn_printztn(ndo, bp, length, ndo->ndo_snapend);
+ if (GET_U_1(bp) != '\0')
+ ND_PRINT(" ");
+ ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
if (ui == 0)
goto trunc;
bp += ui;
@@ -168,36 +166,33 @@
case DATA:
if (length < 2)
goto trunc; /* no block number */
- ND_TCHECK_16BITS(bp);
- ND_PRINT((ndo, " block %d", EXTRACT_16BITS(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_16BITS(bp);
- ND_PRINT((ndo, " %s", tok2str(err2str, "tftp-err-#%d \"",
- EXTRACT_16BITS(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((ndo, " \""));
- ui = fn_printztn(ndo, bp, length, ndo->ndo_snapend);
- ND_PRINT((ndo, "\""));
+ ND_PRINT(" \"");
+ ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
+ ND_PRINT("\"");
if (ui == 0)
goto trunc;
break;
default:
/* We shouldn't get here */
- ND_PRINT((ndo, "(unknown #%d)", opcode));
+ ND_PRINT("(unknown #%u)", opcode);
break;
}
return;
trunc:
- ND_PRINT((ndo, "%s", tstr));
- return;
+ nd_print_trunc(ndo);
}