From: Dave Hart <hart@ntp.org>
Date: Wed, 7 Dec 2011 22:24:26 +0000 (+0000)
Subject: [Bug 2086] get_systime() should not offset by sys_residual.
X-Git-Tag: NTP_4_2_6P5_RC3~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c42bf953adfcc7f90c4cd3bf6ee17d30e8a8b3d2;p=thirdparty%2Fntp.git

[Bug 2086] get_systime() should not offset by sys_residual.

bk: 4edfe79aaALP-OUefVNdMa7dVIVN8Q
---

diff --git a/ChangeLog b/ChangeLog
index c5abee0a3..a11a925a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,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.
+* [Bug 2086] get_systime() should not offset by sys_residual.
 * Ensure NULL peer->dstadr is not accessed in orphan parent selection.
 
 ---
diff --git a/libntp/systime.c b/libntp/systime.c
index e45c4d626..0dbf38968 100644
--- a/libntp/systime.c
+++ b/libntp/systime.c
@@ -81,7 +81,7 @@ get_systime(
 		dtemp = ntp_random() * 2. / FRAC * sys_tick * 1e9;
 	else if (sys_tick > 0)
 		dtemp = ntp_random() * 2. / FRAC;
-	dtemp = (ts.tv_nsec + dtemp) * 1e-9 + sys_residual;
+	dtemp = (ts.tv_nsec + dtemp) * 1e-9;
 	if (dtemp >= 1.) {
 		dtemp -= 1.;
 		now->l_i++;
@@ -105,7 +105,7 @@ get_systime(
 		dtemp = ntp_random() * 2. / FRAC * sys_tick * 1e6;
 	else if (sys_tick > 0)
 		dtemp = ntp_random() * 2. / FRAC;
-	dtemp = (tv.tv_usec + dtemp) * 1e-6 + sys_residual;
+	dtemp = (tv.tv_usec + dtemp) * 1e-6;
 	if (dtemp >= 1.) {
 		dtemp -= 1.;
 		now->l_i++;