SLL: Remove two useless tests

[tcpdump] / print-ntp.c

diff --git a/print-ntp.c b/print-ntp.c
index 7643ade1bb6f7a82080bd04ea5149bd8921b500e..9cfda05f3ea2f4bcec4c9ff25f846db23accfc8b 100644 (file)
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -46,7 +46,6 @@
 #include "addrtoname.h"
 #include "extract.h"
 
-static const char tstr[] = " [|ntp]";
 
 /*
  * Based on ntp.h from the U of MD implementation
@@ -277,7 +276,7 @@ ntp_time_print(netdissect_options *ndo,
 
        ND_TCHECK_1(bp->ppoll);
        ND_PRINT(", poll %d", EXTRACT_S_1(bp->ppoll));
-       p_poll(ndo, EXTRACT_U_1(bp->ppoll));
+       p_poll(ndo, EXTRACT_S_1(bp->ppoll));
 
        ND_TCHECK_1(bp->precision);
        ND_PRINT(", precision %d", EXTRACT_S_1(bp->precision));
@@ -300,7 +299,7 @@ ntp_time_print(netdissect_options *ndo,
                break;
 
        case PRIM_REF:
-               if (fn_printn(ndo, (const u_char *)&(bp->refid), 4, ndo->ndo_snapend))
+               if (nd_printn(ndo, (const u_char *)&(bp->refid), 4, ndo->ndo_snapend))
                        goto trunc;
                break;
 
@@ -351,33 +350,33 @@ ntp_time_print(netdissect_options *ndo,
                ND_TCHECK_4(bp->key_id);
                ND_PRINT("\n\tKey id: %u", EXTRACT_BE_U_4(bp->key_id));
                ND_TCHECK_LEN(bp->message_digest, 16);
-                ND_PRINT("\n\tAuthentication: %08x%08x%08x%08x",
-                              EXTRACT_BE_U_4(bp->message_digest),
-                              EXTRACT_BE_U_4(bp->message_digest + 4),
-                              EXTRACT_BE_U_4(bp->message_digest + 8),
-                              EXTRACT_BE_U_4(bp->message_digest + 12));
+               ND_PRINT("\n\tAuthentication: %08x%08x%08x%08x",
+                        EXTRACT_BE_U_4(bp->message_digest),
+                        EXTRACT_BE_U_4(bp->message_digest + 4),
+                        EXTRACT_BE_U_4(bp->message_digest + 8),
+                        EXTRACT_BE_U_4(bp->message_digest + 12));
        } else if (length == NTP_TIMEMSG_MINLEN + 4 + 20) {     /* Optional: key-id + 160-bit digest */
                ND_TCHECK_4(bp->key_id);
                ND_PRINT("\n\tKey id: %u", EXTRACT_BE_U_4(bp->key_id));
                ND_TCHECK_LEN(bp->message_digest, 20);
                ND_PRINT("\n\tAuthentication: %08x%08x%08x%08x%08x",
-                              EXTRACT_BE_U_4(bp->message_digest),
-                              EXTRACT_BE_U_4(bp->message_digest + 4),
-                              EXTRACT_BE_U_4(bp->message_digest + 8),
-                              EXTRACT_BE_U_4(bp->message_digest + 12),
-                              EXTRACT_BE_U_4(bp->message_digest + 16));
+                        EXTRACT_BE_U_4(bp->message_digest),
+                        EXTRACT_BE_U_4(bp->message_digest + 4),
+                        EXTRACT_BE_U_4(bp->message_digest + 8),
+                        EXTRACT_BE_U_4(bp->message_digest + 12),
+                        EXTRACT_BE_U_4(bp->message_digest + 16));
        } else if (length > NTP_TIMEMSG_MINLEN) {
                ND_PRINT("\n\t(%u more bytes after the header)", length - NTP_TIMEMSG_MINLEN);
        }
        return;
 
 invalid:
-       ND_PRINT(" %s", istr);
+       nd_print_invalid(ndo);
        ND_TCHECK_LEN(bp, length);
        return;
 
 trunc:
-       ND_PRINT(" %s", tstr);
+       nd_print_trunc(ndo);
 }
 
 /*
@@ -432,12 +431,12 @@ ntp_control_print(netdissect_options *ndo,
        return;
 
 invalid:
-       ND_PRINT(" %s", istr);
+       nd_print_invalid(ndo);
        ND_TCHECK_LEN(cd, length);
        return;
 
 trunc:
-       ND_PRINT(" %s", tstr);
+       nd_print_trunc(ndo);
 }
 
 union ntpdata {
@@ -450,12 +449,13 @@ union ntpdata {
  */
 void
 ntp_print(netdissect_options *ndo,
-          const u_char *cp, u_int length)
+         const u_char *cp, u_int length)
 {
        const union ntpdata *bp = (const union ntpdata *)cp;
        u_int mode, version, leapind;
        uint8_t status;
 
+       ndo->ndo_protocol = "ntp";
        ND_TCHECK_1(bp->td.status);
        status = EXTRACT_U_1(bp->td.status);
 
@@ -465,19 +465,19 @@ ntp_print(netdissect_options *ndo,
        mode = (status & MODEMASK) >> MODESHIFT;
        if (!ndo->ndo_vflag) {
                ND_PRINT(", %s, length %u",
-                         tok2str(ntp_mode_values, "Unknown mode", mode),
-                         length);
+                        tok2str(ntp_mode_values, "Unknown mode", mode),
+                        length);
                return;
        }
 
        ND_PRINT(", %s, length %u\n",
-                 tok2str(ntp_mode_values, "Unknown mode", mode), length);
+                 tok2str(ntp_mode_values, "Unknown mode", mode), length);
 
        /* leapind = (status & LEAPMASK) >> LEAPSHIFT; */
        leapind = (status & LEAPMASK);
        ND_PRINT("\tLeap indicator: %s (%u)",
-                 tok2str(ntp_leapind_values, "Unknown", leapind),
-                 leapind);
+                tok2str(ntp_leapind_values, "Unknown", leapind),
+                leapind);
 
        switch (mode) {
 
@@ -500,7 +500,7 @@ ntp_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT(" %s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -522,7 +522,7 @@ p_sfix(netdissect_options *ndo,
 
 static void
 p_ntp_time(netdissect_options *ndo,
-           const struct l_fixedpt *lfp)
+          const struct l_fixedpt *lfp)
 {
        uint32_t i;
        uint32_t uf;
@@ -536,7 +536,7 @@ p_ntp_time(netdissect_options *ndo,
                ff += FMAXINT;
        ff = ff / FMAXINT;                      /* shift radix point by 32 bits */
        f = (uint32_t)(ff * 1000000000.0);      /* treat fraction as parts per billion */
-       ND_PRINT("%u.%09d", i, f);
+       ND_PRINT("%u.%09u", i, f);
 
 #ifdef HAVE_STRFTIME
        /*
@@ -566,7 +566,7 @@ p_ntp_time(netdissect_options *ndo,
                    ND_PRINT(" (unrepresentable)");
                } else {
                    /* use ISO 8601 (RFC3339) format */
-                   strftime(time_buf, sizeof (time_buf), "%Y-%m-%dT%H:%M:%S", tm);
+                   strftime(time_buf, sizeof (time_buf), "%Y-%m-%dT%H:%M:%SZ", tm);
                    ND_PRINT(" (%s)", time_buf);
                }
            }
@@ -577,12 +577,12 @@ p_ntp_time(netdissect_options *ndo,
 /* Prints time difference between *lfp and *olfp */
 static void
 p_ntp_delta(netdissect_options *ndo,
-            const struct l_fixedpt *olfp,
-            const struct l_fixedpt *lfp)
+           const struct l_fixedpt *olfp,
+           const struct l_fixedpt *lfp)
 {
-       int32_t i;
        uint32_t u, uf;
        uint32_t ou, ouf;
+       uint32_t i;
        uint32_t f;
        double ff;
        int signbit;
@@ -596,20 +596,20 @@ p_ntp_delta(netdissect_options *ndo,
                return;
        }
 
-       i = u - ou;
-
-       if (i > 0) {            /* new is definitely greater than old */
+       if (u > ou) {           /* new is definitely greater than old */
                signbit = 0;
+               i = u - ou;
                f = uf - ouf;
                if (ouf > uf)   /* must borrow from high-order bits */
                        i -= 1;
-       } else if (i < 0) {     /* new is definitely less than old */
+       } else if (u < ou) {    /* new is definitely less than old */
                signbit = 1;
+               i = ou - u;
                f = ouf - uf;
-               if (uf > ouf)   /* must carry into the high-order bits */
-                       i += 1;
-               i = -i;
+               if (uf > ouf)   /* must borrow from the high-order bits */
+                       i -= 1;
        } else {                /* int_part is zero */
+               i = 0;
                if (uf > ouf) {
                        signbit = 0;
                        f = uf - ouf;
@@ -624,7 +624,7 @@ p_ntp_delta(netdissect_options *ndo,
                ff += FMAXINT;
        ff = ff / FMAXINT;                      /* shift radix point by 32 bits */
        f = (uint32_t)(ff * 1000000000.0);      /* treat fraction as parts per billion */
-       ND_PRINT("%s%d.%09d", signbit ? "-" : "+", i, f);
+       ND_PRINT("%s%u.%09u", signbit ? "-" : "+", i, f);
 }
 
 /* Prints polling interval in log2 as seconds or fraction of second */