ntp_request.h:

  bug 672:
  rearrange struct info_if_stats to be compacter and
  pad to a 64 bit size boundary for coexistance with
  32 and 64 bit platforms
layout.std:
  bug 672:
  document changed struct info_if_stats layout

bk: 44c1f848V_qSUyimY40BTvaQ26UFBQ

diff --git a/include/ntp_request.h b/include/ntp_request.h
index 4ac053a2198ea5c38992d6f8ad3b8247d6cf8b13..a0cf8057277c53c8396e6df1baa364e359c572a1 100644 (file)
--- a/include/ntp_request.h
+++ b/include/ntp_request.h
@@ -893,7 +893,6 @@ struct info_if_stats {
        union addrun unmask;            /* mask */
        u_int32 v6_flag;                /* is this v6 */
        char name[32];                  /* name of interface */
-       u_short family;                 /* Address family */
        int32 flags;                    /* interface flags */
        int32 last_ttl;                 /* last TTL specified */
        int32 num_mcast;                /* No. of IP addresses in multicast socket */
@@ -904,9 +903,11 @@ struct info_if_stats {
        u_int32 scopeid;                /* Scope used for Multicasting */
        u_int32 ifindex;                /* interface index - from system */
        u_int32 ifnum;                  /* sequential interface number */
-       u_char ignore_packets;          /* Specify whether the packet should be ignored */
         u_int32 peercnt;               /* number of peers referencinf this interface - informational only */
+       u_short family;                 /* Address family */
+       u_char ignore_packets;          /* Specify whether the packet should be ignored */
         u_char action;                 /* reason the item is listed */
+       int32 _filler0;                 /* pad to a 64 bit size boundary */
 };
 
 #define IFS_EXISTS     1       /* just exists */

diff --git a/ntpdc/layout.std b/ntpdc/layout.std
index a244bf7cd2f1a9c1067aa9fea6d2d5edf8713307..daff63678460ef0d5c97100ec21f3145bdee8d3f 100644 (file)
--- a/ntpdc/layout.std
+++ b/ntpdc/layout.std
@@ -410,26 +410,27 @@ offsetof(calcnt) = 48
 offsetof(errcnt) = 52
 offsetof(stbcnt) = 56
 
-sizeof(struct info_if_stats) = 140
+sizeof(struct info_if_stats) = 136
 offsetof(unaddr) = 0
 offsetof(unbcast) = 16
 offsetof(unmask) = 32
 offsetof(v6_flag) = 48
 offsetof(name) = 52
-offsetof(family) = 84
-offsetof(flags) = 88
-offsetof(last_ttl) = 92
-offsetof(num_mcast) = 96
-offsetof(received) = 100
-offsetof(sent) = 104
-offsetof(notsent) = 108
-offsetof(uptime) = 112
-offsetof(scopeid) = 116
-offsetof(ifindex) = 120
-offsetof(ifnum) = 124
-offsetof(ignore_packets) = 128
-offsetof(peercnt) = 132
-offsetof(action) = 136
+offsetof(flags) = 84
+offsetof(last_ttl) = 88
+offsetof(num_mcast) = 92
+offsetof(received) = 96
+offsetof(sent) = 100
+offsetof(notsent) = 104
+offsetof(uptime) = 108
+offsetof(scopeid) = 112
+offsetof(ifindex) = 116
+offsetof(ifnum) = 120
+offsetof(peercnt) = 124
+offsetof(family) = 128
+offsetof(ignore_packets) = 130
+offsetof(action) = 131
+offsetof(_filler0) = 132
 
 sizeof(struct info_dns_assoc) = 32
 offsetof(peeraddr) = 0