From: Dave Hart <hart@ntp.org>
Date: Wed, 7 Dec 2011 22:57:38 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2085-86-87
X-Git-Tag: NTP_4_2_7P238~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4434c7d9f3d49e6f78884180aea4e0d03ca87cad;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2085-86-87
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-2085-86-87

bk: 4edfef62uEwf86myPvAhhTg06xAlUA
---

4434c7d9f3d49e6f78884180aea4e0d03ca87cad
diff --cc ntpd/ntp_proto.c
index 622f11bf9,03e3593b9..9b82e084e
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@@ -1811,12 -1667,10 +1811,13 @@@ clock_update
  		sys_refid = peer->refid;
  	else
  		sys_refid = addr2refid(&peer->srcadr);
 -	dtemp = sys_jitter + fabs(sys_offset) + peer->disp +
 +	dtemp = fabs(sys_offset) + peer->disp + peer->rootdisp +
- 	    clock_phi * (current_time - peer->update) + sys_jitter;
+ 	    (peer->delay + peer->rootdelay) / 2 + clock_phi *
 -	    (current_time - peer->update);
 -	sys_rootdisp = dtemp + peer->rootdisp;
++	    (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;
  
@@@ -2838,9 -2698,9 +2839,9 @@@ clock_select(void
  	if (typesystem != NULL) {
  		if (sys_prefer == NULL) {
  			typesystem->new_status = CTL_PST_SEL_SYSPEER;
 -			clock_combine(peer_list, sys_survivors);
 +			clock_combine(peers, 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;