Revert partially the commit 21b1273

[tcpdump] / print-tftp.c

diff --git a/print-tftp.c b/print-tftp.c
index de9d4ebbca89188c021e25c19ae076b1578db92c..e90fb68c1da044e2152572db41bd9f9ce7706e4b 100644 (file)
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -97,14 +97,13 @@ tftp_print(netdissect_options *ndo,
        ndo->ndo_protocol = "tftp";
 
        /* Print protocol */
-       ND_PRINT("TFTP");
+       nd_print_protocol_caps(ndo);
        /* Print length */
        ND_PRINT(", length %u", length);
 
        /* Print tftp request type */
        if (length < 2)
                goto trunc;
-       ND_TCHECK_2(bp);
        opcode = GET_BE_U_2(bp);
        cp = tok2str(op2str, "tftp-#%u", opcode);
        ND_PRINT(", %s", cp);
@@ -142,7 +141,6 @@ tftp_print(netdissect_options *ndo,
 
                /* Print options, if any */
                while (length != 0) {
-                       ND_TCHECK_1(bp);
                        if (GET_U_1(bp) != '\0')
                                ND_PRINT(" ");
                        ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
@@ -156,7 +154,6 @@ tftp_print(netdissect_options *ndo,
        case OACK:
                /* Print options */
                while (length != 0) {
-                       ND_TCHECK_1(bp);
                        if (GET_U_1(bp) != '\0')
                                ND_PRINT(" ");
                        ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
@@ -171,7 +168,6 @@ tftp_print(netdissect_options *ndo,
        case DATA:
                if (length < 2)
                        goto trunc;     /* no block number */
-               ND_TCHECK_2(bp);
                ND_PRINT(" block %u", GET_BE_U_2(bp));
                break;
 
@@ -179,7 +175,6 @@ tftp_print(netdissect_options *ndo,
                /* Print error code string */
                if (length < 2)
                        goto trunc;     /* no error code */
-               ND_TCHECK_2(bp);
                ND_PRINT(" %s", tok2str(err2str, "tftp-err-#%u \"",
                                       GET_BE_U_2(bp)));
                bp += 2;