[Git][NTPsec/ntpsec][master] Revert "Move ntp_monitor() call to where it catches Mode 6 packets."

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
bc426587 by Eric S. Raymond at 2016-12-16T16:13:48-05:00
Revert "Move ntp_monitor() call to where it catches Mode 6 packets."

This causes a flood loop when ntpmon runs.

- - - - -


1 changed file:

- ntpd/ntp_proto.c


Changes:

=====================================
ntpd/ntp_proto.c
=====================================
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -739,12 +739,6 @@ receive(
 		goto done;
 	}
 
-	restrict_mask = ntp_monitor(rbufp, restrict_mask);
-	if (restrict_mask & RES_LIMITED) {
-		sys_limitrejected++;
-		if(!(restrict_mask & RES_KOD)) { goto done; }
-	}
-
 	if(is_control_packet(rbufp)) {
 		process_control(rbufp, restrict_mask);
 		goto done;
@@ -789,6 +783,12 @@ receive(
 		}
 	}
 
+	restrict_mask = ntp_monitor(rbufp, restrict_mask);
+	if (restrict_mask & RES_LIMITED) {
+		sys_limitrejected++;
+		if(!(restrict_mask & RES_KOD)) { goto done; }
+	}
+
 	switch(match) {
 	    case AM_FXMIT:
             case AM_NEWPASS:



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/bc4265871c49dbd3b824ecc610e92ce368e5e3bf
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20161216/09586ac1/attachment.html>