Revert partially the commit 21b1273

[tcpdump] / print-timed.c

diff --git a/print-timed.c b/print-timed.c
index 9940821aa37e53209eb0b5f6724a4fb4535314e8..ae8d576634fd6f7560adb806745280d359937f93 100644 (file)
--- a/print-timed.c
+++ b/print-timed.c
@@ -98,29 +98,24 @@ timed_print(netdissect_options *ndo,
        int sec, usec;
 
        ndo->ndo_protocol = "timed";
        int sec, usec;
 
        ndo->ndo_protocol = "timed";

-       ND_TCHECK_1(tsp->tsp_type);

        tsp_type = GET_U_1(tsp->tsp_type);
        if (tsp_type < TSPTYPENUMBER)
                ND_PRINT("TSP_%s", tsptype[tsp_type]);
        else
                ND_PRINT("(tsp_type %#x)", tsp_type);
 
        tsp_type = GET_U_1(tsp->tsp_type);
        if (tsp_type < TSPTYPENUMBER)
                ND_PRINT("TSP_%s", tsptype[tsp_type]);
        else
                ND_PRINT("(tsp_type %#x)", tsp_type);
 

-       ND_TCHECK_1(tsp->tsp_vers);

        ND_PRINT(" vers %u", GET_U_1(tsp->tsp_vers));
 
        ND_PRINT(" vers %u", GET_U_1(tsp->tsp_vers));
 

-       ND_TCHECK_2(tsp->tsp_seq);

        ND_PRINT(" seq %u", GET_BE_U_2(tsp->tsp_seq));
 
        switch (tsp_type) {
        case TSP_LOOP:
        ND_PRINT(" seq %u", GET_BE_U_2(tsp->tsp_seq));
 
        switch (tsp_type) {
        case TSP_LOOP:

-               ND_TCHECK_1(tsp->tsp_hopcnt);

                ND_PRINT(" hopcnt %u", GET_U_1(tsp->tsp_hopcnt));
                break;
        case TSP_SETTIME:
        case TSP_ADJTIME:
        case TSP_SETDATE:
        case TSP_SETDATEREQ:
                ND_PRINT(" hopcnt %u", GET_U_1(tsp->tsp_hopcnt));
                break;
        case TSP_SETTIME:
        case TSP_ADJTIME:
        case TSP_SETDATE:
        case TSP_SETDATEREQ:

-               ND_TCHECK_8(&tsp->tsp_time);

                sec = GET_BE_S_4(tsp->tsp_time.tv_sec);
                usec = GET_BE_S_4(tsp->tsp_time.tv_usec);
                /* XXX The comparison below is always false? */
                sec = GET_BE_S_4(tsp->tsp_time.tv_sec);
                usec = GET_BE_S_4(tsp->tsp_time.tv_usec);
                /* XXX The comparison below is always false? */