IS-IS: Use more ND_TCHECK_n() macros

[tcpdump] / print-ntp.c

diff --git a/print-ntp.c b/print-ntp.c
index e30f8845e9fed26b5f2089861833a83cc5daa38b..257b65e80aafcc65ab15991828bcd76ec95ee44c 100644 (file)
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -33,10 +33,10 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #ifdef HAVE_STRFTIME
 #include <time.h>
@@ -282,11 +282,11 @@ ntp_time_print(netdissect_options *ndo,
        ND_TCHECK_1(bp->precision);
        ND_PRINT(", precision %d", EXTRACT_S_1(bp->precision));
 
-       ND_TCHECK(bp->root_delay);
+       ND_TCHECK_SIZE(&bp->root_delay);
        ND_PRINT("\n\tRoot Delay: ");
        p_sfix(ndo, &bp->root_delay);
 
-       ND_TCHECK(bp->root_dispersion);
+       ND_TCHECK_SIZE(&bp->root_dispersion);
        ND_PRINT(", Root dispersion: ");
        p_sfix(ndo, &bp->root_dispersion);
 
@@ -321,19 +321,19 @@ ntp_time_print(netdissect_options *ndo,
                break;
        }
 
-       ND_TCHECK(bp->ref_timestamp);
+       ND_TCHECK_SIZE(&bp->ref_timestamp);
        ND_PRINT("\n\t  Reference Timestamp:  ");
        p_ntp_time(ndo, &(bp->ref_timestamp));
 
-       ND_TCHECK(bp->org_timestamp);
+       ND_TCHECK_SIZE(&bp->org_timestamp);
        ND_PRINT("\n\t  Originator Timestamp: ");
        p_ntp_time(ndo, &(bp->org_timestamp));
 
-       ND_TCHECK(bp->rec_timestamp);
+       ND_TCHECK_SIZE(&bp->rec_timestamp);
        ND_PRINT("\n\t  Receive Timestamp:    ");
        p_ntp_time(ndo, &(bp->rec_timestamp));
 
-       ND_TCHECK(bp->xmt_timestamp);
+       ND_TCHECK_SIZE(&bp->xmt_timestamp);
        ND_PRINT("\n\t  Transmit Timestamp:   ");
        p_ntp_time(ndo, &(bp->xmt_timestamp));
 
@@ -453,14 +453,14 @@ ntp_print(netdissect_options *ndo,
           const u_char *cp, u_int length)
 {
        const union ntpdata *bp = (const union ntpdata *)cp;
-       int mode, version, leapind;
+       u_int mode, version, leapind;
        uint8_t status;
 
        ND_TCHECK_1(bp->td.status);
        status = EXTRACT_U_1(bp->td.status);
 
        version = (status & VERSIONMASK) >> VERSIONSHIFT;
-       ND_PRINT("NTPv%d", version);
+       ND_PRINT("NTPv%u", version);
 
        mode = (status & MODEMASK) >> MODESHIFT;
        if (!ndo->ndo_vflag) {
@@ -479,12 +479,24 @@ ntp_print(netdissect_options *ndo,
                  tok2str(ntp_leapind_values, "Unknown", leapind),
                  leapind);
 
-       if (mode >= MODE_UNSPEC && mode <= MODE_BROADCAST)
+       switch (mode) {
+
+       case MODE_UNSPEC:
+       case MODE_SYM_ACT:
+       case MODE_SYM_PAS:
+       case MODE_CLIENT:
+       case MODE_SERVER:
+       case MODE_BROADCAST:
                ntp_time_print(ndo, &bp->td, length);
-       else if (mode == MODE_CONTROL)
+               break;
+
+       case MODE_CONTROL:
                ntp_control_print(ndo, &bp->cd, length);
-       else
-               {;}                     /* XXX: not implemented! */
+               break;
+
+       default:
+               break;                  /* XXX: not implemented! */
+       }
        return;
 
 trunc: