More nd_ification of structures.

[tcpdump] / print-ntp.c

diff --git a/print-ntp.c b/print-ntp.c
index ca455b2a93564c622bbdb6c1fe6fd6e4e838d3bb..f2fbd1aa0d17a3651096701f57694591eb676b6e 100644 (file)
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -24,6 +24,14 @@
 
 /* \summary: Network Time Protocol (NTP) printer */
 
 
 /* \summary: Network Time Protocol (NTP) printer */
 

+/*
+ * specification:
+ *
+ * RFC 1119 - NTPv2
+ * RFC 1305 - NTPv3
+ * RFC 5905 - NTPv4
+ */
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif


@@ -48,7 +56,7 @@ static const char tstr[] = " [|ntp]";
 /*
  *  Definitions for the masses
  */
 /*
  *  Definitions for the masses
  */

-#define        JAN_1970        2208988800U     /* 1970 - 1900 in seconds */
+#define        JAN_1970        INT64_T_CONSTANT(2208988800)    /* 1970 - 1900 in seconds */

 
 /*
  * Structure definitions for NTP fixed point values
 
 /*
  * Structure definitions for NTP fixed point values


@@ -70,12 +78,12 @@ static const char tstr[] = " [|ntp]";
 struct l_fixedpt {
        nd_uint32_t int_part;
        nd_uint32_t fraction;
 struct l_fixedpt {
        nd_uint32_t int_part;
        nd_uint32_t fraction;

-} UNALIGNED;
+};

 
 struct s_fixedpt {
        nd_uint16_t int_part;
        nd_uint16_t fraction;
 
 struct s_fixedpt {
        nd_uint16_t int_part;
        nd_uint16_t fraction;

-} UNALIGNED;
+};

 
 /* rfc2030
  *                      1                   2                   3
 
 /* rfc2030
  *                      1                   2                   3


@@ -135,7 +143,7 @@ struct ntp_time_data {
        struct l_fixedpt xmt_timestamp;
        nd_uint32_t key_id;
        nd_uint8_t  message_digest[20];
        struct l_fixedpt xmt_timestamp;
        nd_uint32_t key_id;
        nd_uint8_t  message_digest[20];

-} UNALIGNED;
+};

 /*
  *     Leap Second Codes (high order two bits)
  */
 /*
  *     Leap Second Codes (high order two bits)
  */


@@ -247,7 +255,7 @@ struct ntp_control_data {
        nd_uint16_t     offset;         /* Offset */
        nd_uint16_t     count;          /* Count */
        nd_uint8_t      data[564];      /* Data, [Padding, [Authenticator]] */
        nd_uint16_t     offset;         /* Offset */
        nd_uint16_t     count;          /* Count */
        nd_uint8_t      data[564];      /* Data, [Padding, [Authenticator]] */

-} UNALIGNED;
+};

 
 /*
  * Print NTP time requests and responses
 
 /*
  * Print NTP time requests and responses


@@ -256,44 +264,23 @@ static void
 ntp_time_print(netdissect_options *ndo,
               register const struct ntp_time_data *bp, u_int length)
 {
 ntp_time_print(netdissect_options *ndo,
               register const struct ntp_time_data *bp, u_int length)
 {

-       int mode, version, leapind;
+       uint8_t stratum;

 
        if (length < NTP_TIMEMSG_MINLEN)
                goto invalid;
 
 
        if (length < NTP_TIMEMSG_MINLEN)
                goto invalid;
 

-       ND_TCHECK(bp->status);
-
-       version = (int)(bp->status & VERSIONMASK) >> VERSIONSHIFT;
-       ND_PRINT((ndo, "NTPv%d", version));
-
-       mode = bp->status & MODEMASK;
-       if (!ndo->ndo_vflag) {
-               ND_PRINT((ndo, ", %s, length %u",
-                         tok2str(ntp_mode_values, "Unknown mode", mode),
-                         length));
-               return;
-       }
-
-       ND_PRINT((ndo, ", length %u\n\t%s",
-                 length,
-                 tok2str(ntp_mode_values, "Unknown mode", mode)));
-
-       leapind = bp->status & LEAPMASK;
-       ND_PRINT((ndo, ", Leap indicator: %s (%u)",
-                 tok2str(ntp_leapind_values, "Unknown", leapind),
-                 leapind));
-
-       ND_TCHECK(bp->stratum);
+       ND_TCHECK_1(bp->stratum);
+       stratum = EXTRACT_U_1(bp->stratum);

        ND_PRINT((ndo, ", Stratum %u (%s)",
        ND_PRINT((ndo, ", Stratum %u (%s)",

-               bp->stratum,
-               tok2str(ntp_stratum_values, (bp->stratum >=2 && bp->stratum<=15) ? "secondary reference" : "reserved", bp->stratum)));
+               stratum,
+               tok2str(ntp_stratum_values, (stratum >=2 && stratum<=15) ? "secondary reference" : "reserved", stratum)));

 
 

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

 
 

-       ND_TCHECK(bp->precision);
-       ND_PRINT((ndo, ", precision %d", bp->precision));
+       ND_TCHECK_1(bp->precision);
+       ND_PRINT((ndo, ", precision %d", EXTRACT_S_1(bp->precision)));

 
        ND_TCHECK(bp->root_delay);
        ND_PRINT((ndo, "\n\tRoot Delay: "));
 
        ND_TCHECK(bp->root_delay);
        ND_PRINT((ndo, "\n\tRoot Delay: "));


@@ -306,7 +293,7 @@ ntp_time_print(netdissect_options *ndo,
        ND_TCHECK(bp->refid);
        ND_PRINT((ndo, ", Reference-ID: "));
        /* Interpretation depends on stratum */
        ND_TCHECK(bp->refid);
        ND_PRINT((ndo, ", Reference-ID: "));
        /* Interpretation depends on stratum */

-       switch (bp->stratum) {
+       switch (stratum) {

 
        case UNSPECIFIED:
                ND_PRINT((ndo, "(unspec)"));
 
        case UNSPECIFIED:
                ND_PRINT((ndo, "(unspec)"));


@@ -330,7 +317,7 @@ ntp_time_print(netdissect_options *ndo,
        default:
                /* In NTPv4 (RFC 5905) refid is an IPv4 address or first 32 bits of
                   MD5 sum of IPv6 address */
        default:
                /* In NTPv4 (RFC 5905) refid is an IPv4 address or first 32 bits of
                   MD5 sum of IPv6 address */

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

                break;
        }
 
                break;
        }
 


@@ -358,27 +345,27 @@ 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) */
 
        /* FIXME: this code is not aware of any extension fields */
        if (length == NTP_TIMEMSG_MINLEN + 4) {         /* Optional: key-id (crypto-NAK) */

-               ND_TCHECK(bp->key_id);
-               ND_PRINT((ndo, "\n\tKey id: %u", EXTRACT_32BITS(&bp->key_id)));
+               ND_TCHECK_4(bp->key_id);
+               ND_PRINT((ndo, "\n\tKey id: %u", EXTRACT_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_TCHECK(bp->key_id);
-               ND_PRINT((ndo, "\n\tKey id: %u", EXTRACT_32BITS(&bp->key_id)));
+               ND_TCHECK_4(bp->key_id);
+               ND_PRINT((ndo, "\n\tKey id: %u", EXTRACT_BE_U_4(bp->key_id)));

                ND_TCHECK2(bp->message_digest, 16);
                 ND_PRINT((ndo, "\n\tAuthentication: %08x%08x%08x%08x",
                ND_TCHECK2(bp->message_digest, 16);
                 ND_PRINT((ndo, "\n\tAuthentication: %08x%08x%08x%08x",

-                              EXTRACT_32BITS(bp->message_digest),
-                              EXTRACT_32BITS(bp->message_digest + 4),
-                              EXTRACT_32BITS(bp->message_digest + 8),
-                              EXTRACT_32BITS(bp->message_digest + 12)));
+                              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 */
        } else if (length == NTP_TIMEMSG_MINLEN + 4 + 20) {     /* Optional: key-id + 160-bit digest */

-               ND_TCHECK(bp->key_id);
-               ND_PRINT((ndo, "\n\tKey id: %u", EXTRACT_32BITS(&bp->key_id)));
+               ND_TCHECK_4(bp->key_id);
+               ND_PRINT((ndo, "\n\tKey id: %u", EXTRACT_BE_U_4(bp->key_id)));

                ND_TCHECK2(bp->message_digest, 20);
                ND_PRINT((ndo, "\n\tAuthentication: %08x%08x%08x%08x%08x",
                ND_TCHECK2(bp->message_digest, 20);
                ND_PRINT((ndo, "\n\tAuthentication: %08x%08x%08x%08x%08x",

-                              EXTRACT_32BITS(bp->message_digest),
-                              EXTRACT_32BITS(bp->message_digest + 4),
-                              EXTRACT_32BITS(bp->message_digest + 8),
-                              EXTRACT_32BITS(bp->message_digest + 12),
-                              EXTRACT_32BITS(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((ndo, "\n\t(%u more bytes after the header)", length - NTP_TIMEMSG_MINLEN));
        }
        } else if (length > NTP_TIMEMSG_MINLEN) {
                ND_PRINT((ndo, "\n\t(%u more bytes after the header)", length - NTP_TIMEMSG_MINLEN));
        }


@@ -400,39 +387,40 @@ static void
 ntp_control_print(netdissect_options *ndo,
                  register const struct ntp_control_data *cd, u_int length)
 {
 ntp_control_print(netdissect_options *ndo,
                  register const struct ntp_control_data *cd, u_int length)
 {

-       u_char R, E, M, opcode;
+       u_int8_t control, R, E, M, opcode;

        uint16_t sequence, status, assoc, offset, count;
 
        if (length < NTP_CTRLMSG_MINLEN)
                goto invalid;
 
        uint16_t sequence, status, assoc, offset, count;
 
        if (length < NTP_CTRLMSG_MINLEN)
                goto invalid;
 

-       ND_TCHECK(cd->control);
-       R = (cd->control & 0x80) != 0;
-       E = (cd->control & 0x40) != 0;
-       M = (cd->control & 0x20) != 0;
-       opcode = cd->control & 0x1f;
+       ND_TCHECK_1(cd->control);
+       control = EXTRACT_U_1(cd->control);
+       R = (control & 0x80) != 0;
+       E = (control & 0x40) != 0;
+       M = (control & 0x20) != 0;
+       opcode = control & 0x1f;

        ND_PRINT((ndo, ", %s, %s, %s, OpCode=%u\n",
                  R ? "Response" : "Request", E ? "Error" : "OK",
        ND_PRINT((ndo, ", %s, %s, %s, OpCode=%u\n",
                  R ? "Response" : "Request", E ? "Error" : "OK",

-                 M ? "More" : "Last", (unsigned)opcode));
+                 M ? "More" : "Last", opcode));

 
 

-       ND_TCHECK(cd->sequence);
-       sequence = EXTRACT_16BITS(&cd->sequence);
+       ND_TCHECK_2(cd->sequence);
+       sequence = EXTRACT_BE_U_2(cd->sequence);

        ND_PRINT((ndo, "\tSequence=%hu", sequence));
 
        ND_PRINT((ndo, "\tSequence=%hu", sequence));
 

-       ND_TCHECK(cd->status);
-       status = EXTRACT_16BITS(&cd->status);
+       ND_TCHECK_2(cd->status);
+       status = EXTRACT_BE_U_2(cd->status);

        ND_PRINT((ndo, ", Status=%#hx", status));
 
        ND_PRINT((ndo, ", Status=%#hx", status));
 

-       ND_TCHECK(cd->assoc);
-       assoc = EXTRACT_16BITS(&cd->assoc);
+       ND_TCHECK_2(cd->assoc);
+       assoc = EXTRACT_BE_U_2(cd->assoc);

        ND_PRINT((ndo, ", Assoc.=%hu", assoc));
 
        ND_PRINT((ndo, ", Assoc.=%hu", assoc));
 

-       ND_TCHECK(cd->offset);
-       offset = EXTRACT_16BITS(&cd->offset);
+       ND_TCHECK_2(cd->offset);
+       offset = EXTRACT_BE_U_2(cd->offset);

        ND_PRINT((ndo, ", Offset=%hu", offset));
 
        ND_PRINT((ndo, ", Offset=%hu", offset));
 

-       ND_TCHECK(cd->count);
-       count = EXTRACT_16BITS(&cd->count);
+       ND_TCHECK_2(cd->count);
+       count = EXTRACT_BE_U_2(cd->count);

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


@@ -466,13 +454,15 @@ ntp_print(netdissect_options *ndo,
 {
        register const union ntpdata *bp = (const union ntpdata *)cp;
        int mode, version, leapind;
 {
        register const union ntpdata *bp = (const union ntpdata *)cp;
        int mode, version, leapind;

+       uint8_t status;

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

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

 
 

-       version = (bp->td.status & VERSIONMASK) >> VERSIONSHIFT;
+       version = (status & VERSIONMASK) >> VERSIONSHIFT;

        ND_PRINT((ndo, "NTPv%d", version));
 
        ND_PRINT((ndo, "NTPv%d", version));
 

-       mode = (bp->td.status & MODEMASK) >> MODESHIFT;
+       mode = (status & MODEMASK) >> MODESHIFT;

        if (!ndo->ndo_vflag) {
                ND_PRINT((ndo, ", %s, length %u",
                          tok2str(ntp_mode_values, "Unknown mode", mode),
        if (!ndo->ndo_vflag) {
                ND_PRINT((ndo, ", %s, length %u",
                          tok2str(ntp_mode_values, "Unknown mode", mode),


@@ -483,8 +473,8 @@ ntp_print(netdissect_options *ndo,
        ND_PRINT((ndo, ", %s, length %u\n",
                  tok2str(ntp_mode_values, "Unknown mode", mode), length));
 
        ND_PRINT((ndo, ", %s, length %u\n",
                  tok2str(ntp_mode_values, "Unknown mode", mode), length));
 

-       /* leapind = (bp->td.status & LEAPMASK) >> LEAPSHIFT; */
-       leapind = (bp->td.status & LEAPMASK);
+       /* leapind = (status & LEAPMASK) >> LEAPSHIFT; */
+       leapind = (status & LEAPMASK);

        ND_PRINT((ndo, "\tLeap indicator: %s (%u)",
                  tok2str(ntp_leapind_values, "Unknown", leapind),
                  leapind));
        ND_PRINT((ndo, "\tLeap indicator: %s (%u)",
                  tok2str(ntp_leapind_values, "Unknown", leapind),
                  leapind));


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

-       i = EXTRACT_16BITS(&sfp->int_part);
-       f = EXTRACT_16BITS(&sfp->fraction);
+       i = EXTRACT_BE_U_2(&sfp->int_part);
+       f = EXTRACT_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((ndo, "%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((ndo, "%d.%06d", i, f));


@@ -522,13 +512,13 @@ static void
 p_ntp_time(netdissect_options *ndo,
            register const struct l_fixedpt *lfp)
 {
 p_ntp_time(netdissect_options *ndo,
            register const struct l_fixedpt *lfp)
 {

-       register int32_t i;
+       register uint32_t i;

        register uint32_t uf;
        register uint32_t f;
        register double ff;
 
        register uint32_t uf;
        register uint32_t f;
        register double ff;
 

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

        ff = uf;
        if (ff < 0.0)           /* some compilers are buggy */
                ff += FMAXINT;
        ff = uf;
        if (ff < 0.0)           /* some compilers are buggy */
                ff += FMAXINT;


@@ -541,14 +531,33 @@ p_ntp_time(netdissect_options *ndo,
         * print the UTC time in human-readable format.
         */
        if (i) {
         * print the UTC time in human-readable format.
         */
        if (i) {

-           time_t seconds = i - JAN_1970;
+           int64_t seconds_64bit = (int64_t)i - JAN_1970;
+           time_t seconds;

            struct tm *tm;
            char time_buf[128];
 
            struct tm *tm;
            char time_buf[128];
 

-           tm = gmtime(&seconds);
-           /* use ISO 8601 (RFC3339) format */
-           strftime(time_buf, sizeof (time_buf), "%Y-%m-%dT%H:%M:%S", tm);
-           ND_PRINT((ndo, " (%s)", time_buf));
+           seconds = (time_t)seconds_64bit;
+           if (seconds != seconds_64bit) {
+               /*
+                * It doesn't fit into a time_t, so we can't hand it
+                * to gmtime.
+                */
+               ND_PRINT((ndo, " (unrepresentable)"));
+           } else {
+               tm = gmtime(&seconds);
+               if (tm == NULL) {
+                   /*
+                    * gmtime() can't handle it.
+                    * (Yes, that might happen with some version of
+                    * Microsoft's C library.)
+                    */
+                   ND_PRINT((ndo, " (unrepresentable)"));
+               } else {
+                   /* use ISO 8601 (RFC3339) format */
+                   strftime(time_buf, sizeof (time_buf), "%Y-%m-%dT%H:%M:%S", tm);
+                   ND_PRINT((ndo, " (%s)", time_buf));
+               }
+           }

        }
 #endif
 }
        }
 #endif
 }


@@ -566,10 +575,10 @@ p_ntp_delta(netdissect_options *ndo,
        register double ff;
        int signbit;
 
        register double ff;
        int signbit;
 

-       u = EXTRACT_32BITS(&lfp->int_part);
-       ou = EXTRACT_32BITS(&olfp->int_part);
-       uf = EXTRACT_32BITS(&lfp->fraction);
-       ouf = EXTRACT_32BITS(&olfp->fraction);
+       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);

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