[Bug 2085] clock_update() sys_rootdisp calculation omits root delay.

bk: 4edfe6f5eLc2Sthit0MYY8GgU2m8Qw

diff --git a/ChangeLog b/ChangeLog
index 28ef5ab7426eecf868c759e23c414824d2826c3d..c5abee0a3261e74de963ed02e18d6b4d42b59c07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 ---
 
 * [Bug 2082] 3-char refid sent by ntpd 4.2.6p5-RC2 ends with extra dot.
+* [Bug 2085] clock_update() sys_rootdisp calculation omits root delay.
 * Ensure NULL peer->dstadr is not accessed in orphan parent selection.
 
 ---

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index cdefca8de17572ee4cdf389923eb5fd2309f6125..0a846d3cc45fd75e984363645951f2d30cc42db5 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -1667,7 +1667,8 @@ clock_update(
                sys_refid = peer->refid;
        else
                sys_refid = addr2refid(&peer->srcadr);
-       dtemp = sys_jitter + fabs(sys_offset) + peer->disp + clock_phi *
+       dtemp = sys_jitter + fabs(sys_offset) + peer->disp +
+           (peer->delay + peer->rootdelay) / 2 + clock_phi *
            (current_time - peer->update);
        sys_rootdisp = dtemp + peer->rootdisp;
        sys_rootdelay = peer->delay + peer->rootdelay;