WWV refclock fixes from Dave Mills

bk: 450669d2bb3hozLsv5al9bab0kDYPA

diff --git a/ntpd/refclock_wwv.c b/ntpd/refclock_wwv.c
index 3477ed57bc6d2dd2d6a8c6b6c38943ca1c1c30d3..cfc94b1b47d9dd9ca577ecc45ed4d94749cb647c 100644 (file)
--- a/ntpd/refclock_wwv.c
+++ b/ntpd/refclock_wwv.c
@@ -1459,14 +1459,17 @@ wwv_endpoc(
         * If the epoch candidate is the same as the last one, increment
         * the run counter. If not, save the length, epoch and end
         * time of the current run for use later and reset the counter.
-        * If the run is at least SCMP (10) s, the SSYNC bit is lit and
-        * the epoch considered valid for synchronization.
+        * The epoch is considered valid if the run is at least SCMP
+        * (10) s, the minute is synchronized and the interval since the
+        * last epoch  is not greater than the averaging interval. Thus,
+        * after a long absence, the program will wait a full averaging
+        * interval while the integrator charges up.
         */
        tmp2 = (tepoch - xepoch) % SECOND;
        if (tmp2 == 0) {
                syncnt++;
-               if (syncnt > SCMP && up->status & MSYNC && up->status &
-                   FGATE) {
+               if (syncnt > SCMP && up->status & MSYNC && (up->status &
+                   FGATE || scount - zcount <= up->avgint)) {
                        up->status |= SSYNC;
                        up->yepoch = tepoch;
                }