[Bug 3660] Manycast orphan mode startup discovery problem

bk: 5ebd1a14qkU3y5pxXBVOklhVzkvk5g

diff --git a/ChangeLog b/ChangeLog
index 35d5d36c2faf434a0bbc79ed85afe3473cc63039..34a7e8d361ff755ca852be1a178fb4a477845fdb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 ---
+
+* [Bug 3660] Manycast orphan mode startup discovery problem. <stenn@ntp.org>
+  - integrated patch from Charles Claggett
+
+---
 (4.2.8p14) 2020/03/03 Released by Harlan Stenn <stenn@ntp.org>
 
 * [Sec 3610] process_control() should bail earlier on short packets. stenn@

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 33e97ef9d9893a2108bff8304b4b8c4fbfee529c..ff422bafae627b17834a1931785aa7220a7dc3f1 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -1333,9 +1333,10 @@ receive(
                 * manycaster has already synchronized to us.
                 */
                if (   sys_leap == LEAP_NOTINSYNC
-                   || sys_stratum >= hisstratum
+                   || sys_stratum > hisstratum + 1
                    || (!sys_cohort && sys_stratum == hisstratum + 1)
                    || rbufp->dstadr->addr_refid == pkt->refid) {
+                       DPRINTF(2, ("receive: sys leap: %0x, sys_stratum %d > hisstratum+1 %d, !sys_cohort %d && sys_stratum == hisstratum+1, loop refid %#x == pkt refid %#x\n", sys_leap, sys_stratum, hisstratum + 1, !sys_cohort, rbufp->dstadr->addr_refid, pkt->refid));
                        DPRINTF(2, ("receive: AM_FXMIT drop: LEAP_NOTINSYNC || stratum || loop\n"));
                        sys_declined++;
                        return;                 /* no help */