From: Dave Hart <hart@ntp.org>
Date: Wed, 7 Dec 2011 22:21:41 +0000 (+0000)
Subject: [Bug 2085] clock_update() sys_rootdisp calculation omits root delay.
X-Git-Tag: NTP_4_2_6P5_RC3~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=609ba7dfa91ab62b04112c61daeed406e503dfc8;p=thirdparty%2Fntp.git

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

bk: 4edfe6f5eLc2Sthit0MYY8GgU2m8Qw
---

diff --git a/ChangeLog b/ChangeLog
index 28ef5ab74..c5abee0a3 100644
--- 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 cdefca8de..0a846d3cc 100644
--- 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;