IPoIB: Add the output with -e for a capture test

[tcpdump] / print-ntp.c

diff --git a/print-ntp.c b/print-ntp.c
index e30f8845e9fed26b5f2089861833a83cc5daa38b..b60b55237b490c193d58135772cf35e048a1c471 100644 (file)
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -33,10 +33,10 @@
  */
 
 #ifdef HAVE_CONFIG_H
  */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"

 
 #ifdef HAVE_STRFTIME
 #include <time.h>
 
 #ifdef HAVE_STRFTIME
 #include <time.h>


@@ -46,7 +46,6 @@
 #include "addrtoname.h"
 #include "extract.h"
 
 #include "addrtoname.h"
 #include "extract.h"
 

-static const char tstr[] = " [|ntp]";

 
 /*
  * Based on ntp.h from the U of MD implementation
 
 /*
  * Based on ntp.h from the U of MD implementation


@@ -270,23 +269,23 @@ ntp_time_print(netdissect_options *ndo,
                goto invalid;
 
        ND_TCHECK_1(bp->stratum);
                goto invalid;
 
        ND_TCHECK_1(bp->stratum);

-       stratum = EXTRACT_U_1(bp->stratum);
+       stratum = GET_U_1(bp->stratum);

        ND_PRINT(", Stratum %u (%s)",
                stratum,
                tok2str(ntp_stratum_values, (stratum >=2 && stratum<=15) ? "secondary reference" : "reserved", stratum));
 
        ND_TCHECK_1(bp->ppoll);
        ND_PRINT(", Stratum %u (%s)",
                stratum,
                tok2str(ntp_stratum_values, (stratum >=2 && stratum<=15) ? "secondary reference" : "reserved", stratum));
 
        ND_TCHECK_1(bp->ppoll);

-       ND_PRINT(", poll %d", EXTRACT_S_1(bp->ppoll));
-       p_poll(ndo, EXTRACT_U_1(bp->ppoll));
+       ND_PRINT(", poll %d", GET_S_1(bp->ppoll));
+       p_poll(ndo, GET_S_1(bp->ppoll));

 
        ND_TCHECK_1(bp->precision);
 
        ND_TCHECK_1(bp->precision);

-       ND_PRINT(", precision %d", EXTRACT_S_1(bp->precision));
+       ND_PRINT(", precision %d", GET_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_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);
 
        ND_PRINT(", Root dispersion: ");
        p_sfix(ndo, &bp->root_dispersion);
 


@@ -300,40 +299,40 @@ ntp_time_print(netdissect_options *ndo,
                break;
 
        case PRIM_REF:
                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;
 
        case INFO_QUERY:
                        goto trunc;
                break;
 
        case INFO_QUERY:

-               ND_PRINT("%s INFO_QUERY", ipaddr_string(ndo, &(bp->refid)));
+               ND_PRINT("%s INFO_QUERY", ipaddr_string(ndo, bp->refid));

                /* this doesn't have more content */
                return;
 
        case INFO_REPLY:
                /* this doesn't have more content */
                return;
 
        case INFO_REPLY:

-               ND_PRINT("%s INFO_REPLY", ipaddr_string(ndo, &(bp->refid)));
+               ND_PRINT("%s INFO_REPLY", ipaddr_string(ndo, bp->refid));

                /* this is too complex to be worth printing */
                return;
 
        default:
                /* In NTPv4 (RFC 5905) refid is an IPv4 address or first 32 bits of
                   MD5 sum of IPv6 address */
                /* this is too complex to be worth printing */
                return;
 
        default:
                /* In NTPv4 (RFC 5905) refid is an IPv4 address or first 32 bits of
                   MD5 sum of IPv6 address */

-               ND_PRINT("0x%08x", EXTRACT_BE_U_4(bp->refid));
+               ND_PRINT("0x%08x", GET_BE_U_4(bp->refid));

                break;
        }
 
                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_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_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_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));
 
        ND_PRINT("\n\t  Transmit Timestamp:   ");
        p_ntp_time(ndo, &(bp->xmt_timestamp));
 


@@ -346,38 +345,38 @@ ntp_time_print(netdissect_options *ndo,
        /* FIXME: this code is not aware of any extension fields */
        if (length == NTP_TIMEMSG_MINLEN + 4) {         /* Optional: key-id (crypto-NAK) */
                ND_TCHECK_4(bp->key_id);
        /* FIXME: this code is not aware of any extension fields */
        if (length == NTP_TIMEMSG_MINLEN + 4) {         /* Optional: key-id (crypto-NAK) */
                ND_TCHECK_4(bp->key_id);

-               ND_PRINT("\n\tKey id: %u", EXTRACT_BE_U_4(bp->key_id));
+               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 */
                ND_TCHECK_4(bp->key_id);
        } else if (length == NTP_TIMEMSG_MINLEN + 4 + 16) {     /* Optional: key-id + 128-bit digest */
                ND_TCHECK_4(bp->key_id);

-               ND_PRINT("\n\tKey id: %u", EXTRACT_BE_U_4(bp->key_id));
+               ND_PRINT("\n\tKey id: %u", GET_BE_U_4(bp->key_id));

                ND_TCHECK_LEN(bp->message_digest, 16);
                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",
+                        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 */
                ND_TCHECK_4(bp->key_id);
        } 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_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",
                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));
+                        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),
+                        GET_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:
        } 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_TCHECK_LEN(bp, length);
        return;
 
 trunc:

-       ND_PRINT(" %s", tstr);
+       nd_print_trunc(ndo);

 }
 
 /*
 }
 
 /*


@@ -394,7 +393,7 @@ ntp_control_print(netdissect_options *ndo,
                goto invalid;
 
        ND_TCHECK_1(cd->control);
                goto invalid;
 
        ND_TCHECK_1(cd->control);

-       control = EXTRACT_U_1(cd->control);
+       control = GET_U_1(cd->control);

        R = (control & 0x80) != 0;
        E = (control & 0x40) != 0;
        M = (control & 0x20) != 0;
        R = (control & 0x80) != 0;
        E = (control & 0x40) != 0;
        M = (control & 0x20) != 0;


@@ -404,23 +403,23 @@ ntp_control_print(netdissect_options *ndo,
                  M ? "More" : "Last", opcode);
 
        ND_TCHECK_2(cd->sequence);
                  M ? "More" : "Last", opcode);
 
        ND_TCHECK_2(cd->sequence);

-       sequence = EXTRACT_BE_U_2(cd->sequence);
+       sequence = GET_BE_U_2(cd->sequence);

        ND_PRINT("\tSequence=%hu", sequence);
 
        ND_TCHECK_2(cd->status);
        ND_PRINT("\tSequence=%hu", sequence);
 
        ND_TCHECK_2(cd->status);

-       status = EXTRACT_BE_U_2(cd->status);
+       status = GET_BE_U_2(cd->status);

        ND_PRINT(", Status=%#hx", status);
 
        ND_TCHECK_2(cd->assoc);
        ND_PRINT(", Status=%#hx", status);
 
        ND_TCHECK_2(cd->assoc);

-       assoc = EXTRACT_BE_U_2(cd->assoc);
+       assoc = GET_BE_U_2(cd->assoc);

        ND_PRINT(", Assoc.=%hu", assoc);
 
        ND_TCHECK_2(cd->offset);
        ND_PRINT(", Assoc.=%hu", assoc);
 
        ND_TCHECK_2(cd->offset);

-       offset = EXTRACT_BE_U_2(cd->offset);
+       offset = GET_BE_U_2(cd->offset);

        ND_PRINT(", Offset=%hu", offset);
 
        ND_TCHECK_2(cd->count);
        ND_PRINT(", Offset=%hu", offset);
 
        ND_TCHECK_2(cd->count);

-       count = EXTRACT_BE_U_2(cd->count);
+       count = GET_BE_U_2(cd->count);

        ND_PRINT(", Count=%hu", count);
 
        if (NTP_CTRLMSG_MINLEN + count > length)
        ND_PRINT(", Count=%hu", count);
 
        if (NTP_CTRLMSG_MINLEN + count > length)


@@ -432,12 +431,12 @@ ntp_control_print(netdissect_options *ndo,
        return;
 
 invalid:
        return;
 
 invalid:

-       ND_PRINT(" %s", istr);
+       nd_print_invalid(ndo);

        ND_TCHECK_LEN(cd, length);
        return;
 
 trunc:
        ND_TCHECK_LEN(cd, length);
        return;
 
 trunc:

-       ND_PRINT(" %s", tstr);
+       nd_print_trunc(ndo);

 }
 
 union ntpdata {
 }
 
 union ntpdata {


@@ -450,45 +449,58 @@ union ntpdata {
  */
 void
 ntp_print(netdissect_options *ndo,
  */
 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;
 {
        const union ntpdata *bp = (const union ntpdata *)cp;

-       int mode, version, leapind;
+       u_int mode, version, leapind;

        uint8_t status;
 
        uint8_t status;
 

+       ndo->ndo_protocol = "ntp";

        ND_TCHECK_1(bp->td.status);
        ND_TCHECK_1(bp->td.status);

-       status = EXTRACT_U_1(bp->td.status);
+       status = GET_U_1(bp->td.status);

 
        version = (status & VERSIONMASK) >> VERSIONSHIFT;
 
        version = (status & VERSIONMASK) >> VERSIONSHIFT;

-       ND_PRINT("NTPv%d", version);
+       ND_PRINT("NTPv%u", version);

 
        mode = (status & MODEMASK) >> MODESHIFT;
        if (!ndo->ndo_vflag) {
                ND_PRINT(", %s, length %u",
 
        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",
                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)",
 
        /* 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);

 
 

-       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);
                ntp_time_print(ndo, &bp->td, length);

-       else if (mode == MODE_CONTROL)
+               break;
+
+       case MODE_CONTROL:

                ntp_control_print(ndo, &bp->cd, length);
                ntp_control_print(ndo, &bp->cd, length);

-       else
-               {;}                     /* XXX: not implemented! */
+               break;
+
+       default:
+               break;                  /* XXX: not implemented! */
+       }

        return;
 
 trunc:
        return;
 
 trunc:

-       ND_PRINT(" %s", tstr);
+       nd_print_trunc(ndo);

 }
 
 static void
 }
 
 static void


@@ -499,8 +511,8 @@ p_sfix(netdissect_options *ndo,
        int f;
        double ff;
 
        int f;
        double ff;
 

-       i = EXTRACT_BE_U_2(sfp->int_part);
-       f = EXTRACT_BE_U_2(sfp->fraction);
+       i = GET_BE_U_2(sfp->int_part);
+       f = GET_BE_U_2(sfp->fraction);

        ff = f / 65536.0;               /* shift radix point by 16 bits */
        f = (int)(ff * 1000000.0);      /* Treat fraction as parts per million */
        ND_PRINT("%d.%06d", i, f);
        ff = f / 65536.0;               /* shift radix point by 16 bits */
        f = (int)(ff * 1000000.0);      /* Treat fraction as parts per million */
        ND_PRINT("%d.%06d", i, f);


@@ -510,21 +522,21 @@ p_sfix(netdissect_options *ndo,
 
 static void
 p_ntp_time(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;
        uint32_t f;
        double ff;
 
 {
        uint32_t i;
        uint32_t uf;
        uint32_t f;
        double ff;
 

-       i = EXTRACT_BE_U_4(lfp->int_part);
-       uf = EXTRACT_BE_U_4(lfp->fraction);
+       i = GET_BE_U_4(lfp->int_part);
+       uf = GET_BE_U_4(lfp->fraction);

        ff = uf;
        if (ff < 0.0)           /* some compilers are buggy */
                ff += FMAXINT;
        ff = ff / FMAXINT;                      /* shift radix point by 32 bits */
        f = (uint32_t)(ff * 1000000000.0);      /* treat fraction as parts per billion */
        ff = uf;
        if (ff < 0.0)           /* some compilers are buggy */
                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
        /*
 
 #ifdef HAVE_STRFTIME
        /*


@@ -554,7 +566,7 @@ p_ntp_time(netdissect_options *ndo,
                    ND_PRINT(" (unrepresentable)");
                } else {
                    /* use ISO 8601 (RFC3339) format */
                    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);
                }
            }
                    ND_PRINT(" (%s)", time_buf);
                }
            }


@@ -565,39 +577,39 @@ p_ntp_time(netdissect_options *ndo,
 /* Prints time difference between *lfp and *olfp */
 static void
 p_ntp_delta(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 u, uf;
        uint32_t ou, ouf;

+       uint32_t i;

        uint32_t f;
        double ff;
        int signbit;
 
        uint32_t f;
        double ff;
        int signbit;
 

-       u = EXTRACT_BE_U_4(lfp->int_part);
-       ou = EXTRACT_BE_U_4(olfp->int_part);
-       uf = EXTRACT_BE_U_4(lfp->fraction);
-       ouf = EXTRACT_BE_U_4(olfp->fraction);
+       u = GET_BE_U_4(lfp->int_part);
+       ou = GET_BE_U_4(olfp->int_part);
+       uf = GET_BE_U_4(lfp->fraction);
+       ouf = GET_BE_U_4(olfp->fraction);

        if (ou == 0 && ouf == 0) {
                p_ntp_time(ndo, lfp);
                return;
        }
 
        if (ou == 0 && ouf == 0) {
                p_ntp_time(ndo, lfp);
                return;
        }
 

-       i = u - ou;
-
-       if (i > 0) {            /* new is definitely greater than old */
+       if (u > ou) {           /* new is definitely greater than old */

                signbit = 0;
                signbit = 0;

+               i = u - ou;

                f = uf - ouf;
                if (ouf > uf)   /* must borrow from high-order bits */
                        i -= 1;
                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;
                signbit = 1;

+               i = ou - u;

                f = ouf - uf;
                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 */
        } else {                /* int_part is zero */

+               i = 0;

                if (uf > ouf) {
                        signbit = 0;
                        f = uf - ouf;
                if (uf > ouf) {
                        signbit = 0;
                        f = uf - ouf;


@@ -612,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 */
                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 */
 }
 
 /* Prints polling interval in log2 as seconds or fraction of second */