GRE: Refine the WCCP header commit. [skip ci]

[tcpdump] / print-ntp.c

diff --git a/print-ntp.c b/print-ntp.c
index 99c089634316ae85c34520fbfe018ed789739c90..d41f515218beb6ff995da398f1707eb5bfd6be34 100644 (file)
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -38,10 +38,7 @@
 
 #include "netdissect-stdinc.h"
 
-#ifdef HAVE_STRFTIME
-#include <time.h>
-#endif
-
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
@@ -180,7 +177,7 @@ static const struct tok ntp_leapind_values[] = {
 
 static const struct tok ntp_stratum_values[] = {
        { UNSPECIFIED,  "unspecified" },
-       { PRIM_REF,     "primary reference" },
+       { PRIM_REF,     "primary reference" },
        { 0, NULL }
 };
 
@@ -246,26 +243,23 @@ ntp_time_print(netdissect_options *ndo,
 
        ND_PRINT(", precision %d", GET_S_1(bp->precision));
 
-       ND_TCHECK_SIZE(&bp->root_delay);
        ND_PRINT("\n\tRoot Delay: ");
        p_sfix(ndo, &bp->root_delay);
 
-       ND_TCHECK_SIZE(&bp->root_dispersion);
        ND_PRINT(", Root dispersion: ");
        p_sfix(ndo, &bp->root_dispersion);
 
-       ND_TCHECK_4(bp->refid);
        ND_PRINT(", Reference-ID: ");
        /* Interpretation depends on stratum */
        switch (stratum) {
 
        case UNSPECIFIED:
                ND_PRINT("(unspec)");
+               ND_TCHECK_4(bp->refid);
                break;
 
        case PRIM_REF:
-               if (nd_printn(ndo, (const u_char *)&(bp->refid), 4, ndo->ndo_snapend))
-                       goto trunc;
+               nd_printjn(ndo, (const u_char *)&(bp->refid), 4);
                break;
 
        case INFO_QUERY:
@@ -285,19 +279,15 @@ ntp_time_print(netdissect_options *ndo,
                break;
        }
 
-       ND_TCHECK_SIZE(&bp->ref_timestamp);
        ND_PRINT("\n\t  Reference Timestamp:  ");
        p_ntp_time(ndo, &(bp->ref_timestamp));
 
-       ND_TCHECK_SIZE(&bp->org_timestamp);
        ND_PRINT("\n\t  Originator Timestamp: ");
        p_ntp_time(ndo, &(bp->org_timestamp));
 
-       ND_TCHECK_SIZE(&bp->rec_timestamp);
        ND_PRINT("\n\t  Receive Timestamp:    ");
        p_ntp_time(ndo, &(bp->rec_timestamp));
 
-       ND_TCHECK_SIZE(&bp->xmt_timestamp);
        ND_PRINT("\n\t  Transmit Timestamp:   ");
        p_ntp_time(ndo, &(bp->xmt_timestamp));
 
@@ -308,19 +298,17 @@ ntp_time_print(netdissect_options *ndo,
        p_ntp_delta(ndo, &(bp->org_timestamp), &(bp->xmt_timestamp));
 
        /* FIXME: this code is not aware of any extension fields */
-       if (length == NTP_TIMEMSG_MINLEN + 4) {         /* Optional: key-id (crypto-NAK) */
+       if (length == NTP_TIMEMSG_MINLEN + 4) { /* Optional: key-id (crypto-NAK) */
                ND_PRINT("\n\tKey id: %u", GET_BE_U_4(bp->key_id));
-       } else if (length == NTP_TIMEMSG_MINLEN + 4 + 16) {     /* Optional: key-id + 128-bit digest */
+       } else if (length == NTP_TIMEMSG_MINLEN + 4 + 16) {     /* Optional: key-id + 128-bit digest */
                ND_PRINT("\n\tKey id: %u", GET_BE_U_4(bp->key_id));
-               ND_TCHECK_LEN(bp->message_digest, 16);
                ND_PRINT("\n\tAuthentication: %08x%08x%08x%08x",
                         GET_BE_U_4(bp->message_digest),
                         GET_BE_U_4(bp->message_digest + 4),
                         GET_BE_U_4(bp->message_digest + 8),
                         GET_BE_U_4(bp->message_digest + 12));
-       } else if (length == NTP_TIMEMSG_MINLEN + 4 + 20) {     /* Optional: key-id + 160-bit digest */
+       } else if (length == NTP_TIMEMSG_MINLEN + 4 + 20) {     /* Optional: key-id + 160-bit digest */
                ND_PRINT("\n\tKey id: %u", GET_BE_U_4(bp->key_id));
-               ND_TCHECK_LEN(bp->message_digest, 20);
                ND_PRINT("\n\tAuthentication: %08x%08x%08x%08x%08x",
                         GET_BE_U_4(bp->message_digest),
                         GET_BE_U_4(bp->message_digest + 4),
@@ -335,10 +323,6 @@ ntp_time_print(netdissect_options *ndo,
 invalid:
        nd_print_invalid(ndo);
        ND_TCHECK_LEN(bp, length);
-       return;
-
-trunc:
-       nd_print_trunc(ndo);
 }
 
 /*
@@ -389,10 +373,6 @@ ntp_control_print(netdissect_options *ndo,
 invalid:
        nd_print_invalid(ndo);
        ND_TCHECK_LEN(cd, length);
-       return;
-
-trunc:
-       nd_print_trunc(ndo);
 }
 
 union ntpdata {