Floor calculation of sys_rootdisp at sys_mindisp in clock_update (from

  Dave Mills).

bk: 4ed5aa60IgWt7LswdlWmbSlz8n_XEA

diff --git a/ChangeLog b/ChangeLog
index 8ffb539f57c94f26cc63d0be5842603376056e52..133cd60820255696b4580c6159f274c24471baac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@
 * from 4.2.6p5-RC2: Exclude not-yet-determined sys_refid from use in
   loopback TEST12 (from Dave Mills).
 * from 4.2.6p5-RC2: Never send KoD rate limiting response to MODE_SERVER.
+* Floor calculation of sys_rootdisp at sys_mindisp in clock_update (from
+  Dave Mills).
 * Restore 4.2.6 clock_combine() weighting to ntp-dev, reverting to pre-
   4.2.7p70 method while also avoiding divide-by-zero (from Dave Mills).
 * Round l_fp traffic interval when converting to integer in rate limit

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 95565b634ea9a3a85aab5bae9313038e70635939..96dd7cd8578af10636e25f4b96a0bf0242fb31b5 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -1811,9 +1811,12 @@ clock_update(
                sys_refid = peer->refid;
        else
                sys_refid = addr2refid(&peer->srcadr);
-       dtemp = sys_jitter + fabs(sys_offset) + peer->disp + clock_phi *
-           (current_time - peer->update);
-       sys_rootdisp = dtemp + peer->rootdisp;
+       dtemp = fabs(sys_offset) + peer->disp + peer->rootdisp +
+           clock_phi * (current_time - peer->update) + sys_jitter;
+       if (dtemp > sys_mindisp)
+               sys_rootdisp = dtemp;
+       else
+               sys_rootdisp = sys_mindisp;
        sys_rootdelay = peer->delay + peer->rootdelay;
        sys_reftime = peer->dst;