ntp: reset tentative flag only when sample was accumulated

When selecting sources from a pool, ignore responses which didn't
produce a new sample. Sources with acceptable delay (as configured by
the maxdelay* options) should be prefered.

diff --git a/ntp_core.c b/ntp_core.c
index ae42b5b575310ed9fa0d50f17932ae4b621a8b31..7ea4a6c7b3736be8e2434a2a3d0fa356dd21a90f 100644 (file)
--- a/ntp_core.c
+++ b/ntp_core.c
@@ -1519,7 +1519,7 @@ receive_packet(NTP_Packet *message, struct timeval *now, double now_err, NCR_Ins
             pkt_root_delay, pkt_root_dispersion);
   }            
 
-  return valid_packet;
+  return good_packet;
 }
 
 /* ================================================== */

diff --git a/ntp_sources.c b/ntp_sources.c
index dbd4748639fed35ba10b97f566dee220ea09466f..32407b4f2821abebe62bac02566011a07faa8b1f 100644 (file)
--- a/ntp_sources.c
+++ b/ntp_sources.c
@@ -792,7 +792,7 @@ NSR_ProcessReceive(NTP_Packet *message, struct timeval *now, double now_err, NTP
       return;
 
     if (record->tentative) {
-      /* This was the first valid reply from the source */
+      /* This was the first good reply from the source */
       record->tentative = 0;
 
       if (record->pool != INVALID_POOL) {