From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 2 Jul 2002 07:30:40 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/backroom/ntp-dev
X-Git-Tag: NTP_4_1_73~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90c828359404fdfd6d9631fda150c576cc9fa985;p=thirdparty%2Fntp.git

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3d2156a0z6qfnKADuwLYRxew4VtkVQ
---

90c828359404fdfd6d9631fda150c576cc9fa985
diff --cc ntpd/ntp_proto.c
index 9a290e5f00,11bf9fb444..185ee1c657
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@@ -205,8 -204,8 +205,8 @@@ transmit
  				clock_select();
  			}
  			if ((peer->stratum > 1 && peer->refid ==
 -			    peer->dstadr->sin.sin_addr.s_addr) ||
 +			    ((struct sockaddr_in*)&peer->dstadr->sin)->sin_addr.s_addr) ||
- 			    peer->stratum >= STRATUM_UNSPEC)
+ 			    peer->stratum == STRATUM_UNSPEC)
  				hpoll++;
  			else
  				hpoll = sys_poll;
@@@ -1386,12 -1320,10 +1321,10 @@@ clock_update(void
  		sys_stratum = sys_peer->stratum + 1;
  		if (sys_stratum == 1)
  			sys_refid = sys_peer->refid;
- 		if (sys_stratum == 1)
- 			sys_refid = sys_peer->refid;;
- 		if (sys_stratum == STRATUM_UNSPEC)
+ 		else if (sys_stratum == STRATUM_UNSPEC)
  			memcpy(&sys_refid, "UNSP", 4);
  		else
 -			sys_refid = sys_peer->srcadr.sin_addr.s_addr;
 +			sys_refid = 0;  /* <**** REFID case to solve *****> */
  		sys_reftime = sys_peer->rec;
  		sys_rootdelay = sys_peer->rootdelay + sys_peer->delay;
  		sys_leap = leap_consensus;