From: Dave Hart <hart@ntp.org>
Date: Wed, 7 Dec 2011 22:28:13 +0000 (+0000)
Subject: [Bug 2087] sys_jitter calculation overweights sys.peer jitter.
X-Git-Tag: NTP_4_2_6P5_RC3~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c98c7edfc6e98b85715ee89177d6c45b42c28f68;p=thirdparty%2Fntp.git

[Bug 2087] sys_jitter calculation overweights sys.peer jitter.

bk: 4edfe87dtAW6uFJc_eMLjDxMIIVV1Q
---

diff --git a/ChangeLog b/ChangeLog
index a11a925a8..5871539bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,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.
+* [Bug 2087] sys_jitter calculation overweights sys.peer jitter.
 * Ensure NULL peer->dstadr is not accessed in orphan parent selection.
 
 ---
diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 0a846d3cc..03e3593b9 100644
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -2699,8 +2699,8 @@ clock_select(void)
 		if (sys_prefer == NULL) {
 			typesystem->new_status = CTL_PST_SEL_SYSPEER;
 			clock_combine(peer_list, sys_survivors);
-			sys_jitter = SQRT(SQUARE(typesystem->jitter) +
-			    SQUARE(sys_jitter) + SQUARE(seljitter));
+			sys_jitter = SQRT(SQUARE(sys_jitter) +
+			    SQUARE(seljitter));
 		} else {
 			typesystem = sys_prefer;
 			sys_clockhop = 0;