Revert partially the commit 21b1273

[tcpdump] / print-tftp.c

diff --git a/print-tftp.c b/print-tftp.c
index 2d765822d70183dca543e3e6affa38b6c8163141..e90fb68c1da044e2152572db41bd9f9ce7706e4b 100644 (file)
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -97,15 +97,14 @@ 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 = EXTRACT_BE_U_2(bp);
+       opcode = GET_BE_U_2(bp);
        cp = tok2str(op2str, "tftp-#%u", opcode);
        ND_PRINT(", %s", cp);
        /* Bail if bogus opcode */
@@ -142,8 +141,7 @@ tftp_print(netdissect_options *ndo,
 
                /* Print options, if any */
                while (length != 0) {
-                       ND_TCHECK_1(bp);
-                       if (EXTRACT_U_1(bp) != '\0')
+                       if (GET_U_1(bp) != '\0')
                                ND_PRINT(" ");
                        ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
                        if (ui == 0)
@@ -156,8 +154,7 @@ tftp_print(netdissect_options *ndo,
        case OACK:
                /* Print options */
                while (length != 0) {
-                       ND_TCHECK_1(bp);
-                       if (EXTRACT_U_1(bp) != '\0')
+                       if (GET_U_1(bp) != '\0')
                                ND_PRINT(" ");
                        ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
                        if (ui == 0)
@@ -171,17 +168,15 @@ tftp_print(netdissect_options *ndo,
        case DATA:
                if (length < 2)
                        goto trunc;     /* no block number */
-               ND_TCHECK_2(bp);
-               ND_PRINT(" block %u", EXTRACT_BE_U_2(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_2(bp);
                ND_PRINT(" %s", tok2str(err2str, "tftp-err-#%u \"",
-                                      EXTRACT_BE_U_2(bp)));
+                                      GET_BE_U_2(bp)));
                bp += 2;
                length -= 2;
                /* Print error message string */