From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 9 Apr 2003 22:30:52 +0000 (-0400)
Subject: Initial refid patch from Dave Mills
X-Git-Tag: NTP_4_1_80_RC1~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76249111aa56b2ed85bd5786458c3831a6edd991;p=thirdparty%2Fntp.git

Initial refid patch from Dave Mills

bk: 3e949f1ceGgwZDGjFlD0SGMtJ3zxOg
---

diff --git a/ntpd/ntp_refclock.c b/ntpd/ntp_refclock.c
index 8ec0dd170..e9443b5c9 100644
--- a/ntpd/ntp_refclock.c
+++ b/ntpd/ntp_refclock.c
@@ -1006,11 +1006,12 @@ refclock_control(
 		if (in->haveflags & CLK_HAVEVAL2)
 			pp->refid = in->fudgeval2;
 		peer->stratum = pp->stratum;
-		if (peer->stratum == 0)
+		if (peer->stratum == STRATUM_REFCLOCK || peer->stratum ==
+		    STRATUM_UNSPEC)
 			peer->refid = pp->refid;
 		else
-			/* Here it is IPv4 address, so we don't have problem with REFID case */
-			peer->refid = ((struct sockaddr_in*)&peer->srcadr)->sin_addr.s_addr;
+			peer->refid = ((struct
+			    sockaddr_in*)&peer->srcadr)->sin_addr.s_addr;
 		if (in->haveflags & CLK_HAVEFLAG1) {
 			pp->sloppyclockflag &= ~CLK_FLAG1;
 			pp->sloppyclockflag |= in->flags & CLK_FLAG1;
diff --git a/ntpd/refclock_atom.c b/ntpd/refclock_atom.c
index 74236dee5..51153aeb5 100644
--- a/ntpd/refclock_atom.c
+++ b/ntpd/refclock_atom.c
@@ -483,7 +483,8 @@ atom_poll(
 		peer->stratum = sys_prefer->stratum;
 	else
 		peer->stratum = pp->stratum;
-	if (peer->stratum == 0)
+	if (peer->stratum == STRATUM_REFCLOCK || peer->stratum ==
+	    STRATUM_UNSPEC)
 		peer->refid = pp->refid;
 	else
 		peer->refid = addr2refid(&sys_prefer->srcadr);