From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 14 May 2020 10:14:44 +0000 (-0700)
Subject: [Bug 3660] Manycast orphan mode startup discovery problem
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8109b7df8c0b96282bf7109c854963ddfd5ff5c2;p=thirdparty%2Fntp.git

[Bug 3660] Manycast orphan mode startup discovery problem

bk: 5ebd1a14qkU3y5pxXBVOklhVzkvk5g
---

diff --git a/ChangeLog b/ChangeLog
index 35d5d36c2..34a7e8d36 100644
--- 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 33e97ef9d..ff422bafa 100644
--- 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 */