Initial refid patch from Dave Mills

bk: 3e949f1ceGgwZDGjFlD0SGMtJ3zxOg

diff --git a/ntpd/ntp_refclock.c b/ntpd/ntp_refclock.c
index 8ec0dd17074b339cba15baeb7e72b1f973b1a47a..e9443b5c9cede3085d1fb9a31907ca97f7c1bed8 100644 (file)
--- 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 74236dee56fff14d5df7f30f6234c4997c2498df..51153aeb5f1a2d1418180e56dced2336a9cc7442 100644 (file)
--- 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);