IPX: Add a length check

[tcpdump] / print-tftp.c

diff --git a/print-tftp.c b/print-tftp.c
index 548a36c5494ea76186228be1e6d41b933ea46ea0..2d765822d70183dca543e3e6affa38b6c8163141 100644 (file)
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -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[] = {
@@ -96,8 +95,11 @@ tftp_print(netdissect_options *ndo,
        u_int ui;
 
        ndo->ndo_protocol = "tftp";
+
+       /* Print protocol */
+       ND_PRINT("TFTP");
        /* Print length */
-       ND_PRINT(" %u", length);
+       ND_PRINT(", length %u", length);
 
        /* Print tftp request type */
        if (length < 2)
@@ -105,7 +107,7 @@ tftp_print(netdissect_options *ndo,
        ND_TCHECK_2(bp);
        opcode = EXTRACT_BE_U_2(bp);
        cp = tok2str(op2str, "tftp-#%u", opcode);
-       ND_PRINT(" %s", cp);
+       ND_PRINT(", %s", cp);
        /* Bail if bogus opcode */
        if (*cp == 't')
                return;
@@ -199,6 +201,6 @@ tftp_print(netdissect_options *ndo,
        }
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return;
 }