[Bug 1620] [Backward Incompatible] "discard minimum" value should be in seconds,...

bk: 4c8b0f92Tg9rn2b0O0O5epVL5KrnDA

diff --git a/ChangeLog b/ChangeLog
index d821bc016a1b67abf07083a1783053d00c4fd203..ecaad40dd854f86d4da388c6dee52d02639ee024 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 * [Bug 1588] finish configure --disable-autokey implementation.
+* [Bug 1620] [Backward Incompatible] "discard minimum" value should be in
+  seconds, not log2 seconds.
 (4.2.7p46) 2010/09/10 Released by Harlan Stenn <stenn@ntp.org>
 * Use AC_SEARCH_LIBS instead of AC_CHECK_LIB for NTP_LIB_M.
 (4.2.7p45) 2010/09/05 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/include/ntp.h b/include/ntp.h
index d4a051aead6510c35a545a15b92da80b07a01b4e..9ecee5d4b78287e5a100601a8736164a431342a7 100644 (file)
--- a/include/ntp.h
+++ b/include/ntp.h
@@ -112,7 +112,7 @@ typedef char s_char;
 #define NTP_MAXDPOLL   10      /* log2 default max poll (~17 m) */
 #define        NTP_MAXPOLL     17      /* log2 max poll interval (~36 h) */
 #define        NTP_RETRY       3       /* max packet retries */
-#define        NTP_MINPKT      1       /* log2 min interburst interval (2 s) */
+#define        NTP_MINPKT      2       /* guard time (s) */
 
 /*
  * Clock filter algorithm tuning parameters

diff --git a/ntpd/ntp_monitor.c b/ntpd/ntp_monitor.c
index 7941ba912b810e9908e8ad2186c09ad15544b21f..f284587e3211a0ff2a9a9086f06fc3e2fe04fb8b 100644 (file)
--- a/ntpd/ntp_monitor.c
+++ b/ntpd/ntp_monitor.c
@@ -383,7 +383,7 @@ ntp_monitor(
                 * This rate-limits the KoDs to no less than the average
                 * headway.
                 */
-               if (interval + 1 >= (1 << ntp_minpkt) && leak < limit) {
+               if (interval + 1 >= ntp_minpkt && leak < limit) {
                        mon->leak = leak - 2;
                        restrict_mask &= ~(RES_LIMITED | RES_KOD);
                } else if (mon->leak < limit)

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 6af7dbf2e3847d0964f82b481c514c833c9c9d85..9a2249cb24c87de0d5ad70613b3b1631f33a57da 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -1843,7 +1843,6 @@ poll_update(
        u_char  mpoll
        )
 {
-       int     minpkt;
        u_long  next, utemp;
        u_char  hpoll;
 
@@ -1899,9 +1898,8 @@ poll_update(
         * slink away. If called from the poll process, delay 1 s for a
         * reference clock, otherwise 2 s.
         */
-       minpkt = 1 << ntp_minpkt;
        utemp = current_time + max(peer->throttle - (NTP_SHIFT - 1) *
-           (1 << peer->minpoll), minpkt);
+           (1 << peer->minpoll), ntp_minpkt);
        if (peer->burst > 0) {
                if (peer->nextdate > current_time)
                        return;
@@ -1919,7 +1917,7 @@ poll_update(
         */
        } else if (peer->cmmd != NULL) {
                if (peer->nextdate > current_time) {
-                       if (peer->nextdate + minpkt != utemp)
+                       if (peer->nextdate + ntp_minpkt != utemp)
                                peer->nextdate = utemp;
                } else {
                        peer->nextdate = utemp;
@@ -1957,7 +1955,7 @@ poll_update(
                else
                        peer->nextdate = utemp;
                if (peer->throttle > (1 << peer->minpoll))
-                       peer->nextdate += minpkt;
+                       peer->nextdate += ntp_minpkt;
        }
 #ifdef DEBUG
        if (debug > 1)
@@ -2048,7 +2046,7 @@ peer_clear(
        if (initializing) {
                peer->nextdate += peer_associations;
        } else if (peer->hmode == MODE_PASSIVE) {
-               peer->nextdate += 1 << ntp_minpkt;
+               peer->nextdate += ntp_minpkt;
        } else {
                peer->nextdate += ntp_random() % peer_associations;
        }