[Git][NTPsec/ntpsec][master] Remove references to extinct fuzzballs.

Eric S. Raymond gitlab at mg.gitlab.com
Tue Jul 12 14:04:35 UTC 2016


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


Commits:
d11409bc by Eric S. Raymond at 2016-07-12T10:03:36-04:00
Remove references to extinct fuzzballs.

- - - - -


2 changed files:

- ntpq/ntpq-subs.c
- ntpq/ntpq.c


Changes:

=====================================
ntpq/ntpq-subs.c
=====================================
--- a/ntpq/ntpq-subs.c
+++ b/ntpq/ntpq-subs.c
@@ -1851,17 +1851,8 @@ dogetpeers(
 	int dsize;
 	u_short rstatus;
 
-#ifdef __UNUSED__
 	res = doquerylist(pvl, CTL_OP_READVAR, associd, 0, &rstatus,
 			  &dsize, &datap);
-#else
-	/*
-	 * Damn fuzzballs
-	 */
-	res = doquery(CTL_OP_READVAR, associd, 0, 0, NULL, &rstatus,
-			  &dsize, &datap);
-#endif
-
 	if (res != 0)
 		return false;
 
@@ -2032,7 +2023,7 @@ apeers(
 
 
 /*
- * lpeers - print a peer spreadsheet including all fuzzball peers
+ * lpeers - print a peer spreadsheet
  */
 /*ARGSUSED*/
 static void
@@ -2121,7 +2112,7 @@ opeers(
 
 
 /*
- * lopeers - print a peer spreadsheet including all fuzzball peers
+ * lopeers - print a peer spreadsheet
  */
 /*ARGSUSED*/
 static void


=====================================
ntpq/ntpq.c
=====================================
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -1053,14 +1053,6 @@ getresponse(
 		if (ntohs(rpkt.associd) != associd) {
 			TRACE(1, ("Association ID %d doesn't match expected %d\n",
 				  ntohs(rpkt.associd), associd));
-			/*
-			 * Hack for silly fuzzballs which, at the time
-			 * of writing, return an assID of sys.peer
-			 * when queried for system variables.
-			 */
-#ifdef __UNUSED__
-			continue;
-#endif
 		}
 
 		/*



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/d11409bc644b8fa783b651c1bc0e893493e47052
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160712/bef41087/attachment.html>


More information about the vc mailing list