[Git][NTPsec/ntpsec][master] Repair mrulist reporting.

[Eric S. Raymond]

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


Commits:
6d3838ec by Eric S. Raymond at 2016-11-26T00:30:44-05:00
Repair mrulist reporting.

The ntp_monitor() call got pushed down a code path that packets (at least,
packets from pool servers) don't normally take.  Result: mosdt traffic
was not getting recorded, and ntpq -c mrulist returned spuriously empty
reports.

Fix verified by actually seeing an mrulist cpme out afterwards.

- - - - -


1 changed file:

- ntpd/ntp_proto.c


Changes:

=====================================
ntpd/ntp_proto.c
=====================================
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -477,12 +477,6 @@ handle_fastxmit(
 		}
 	}
 
-	restrict_mask = ntp_monitor(rbufp, restrict_mask);
-	if (restrict_mask & RES_LIMITED) {
-		sys_limitrejected++;
-		if(!(restrict_mask & RES_KOD)) { return; }
-	}
-
 	/* To prevent exposing an authentication oracle, only MAC
 	   the response if the request passed authentication.
 	*/
@@ -793,6 +787,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/6d3838ec2555e0294d90f3a5ef4487f6d1b00138
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20161126/ff69e576/attachment.html>