 @@ -1,1015 +1,1015 @@
-/*	$NetBSD: ntpq-subs.c,v 1.1.1.1 2009/12/13 16:56:29 kardel Exp $	*/
+/*	$NetBSD: ntpq-subs.c,v 1.2 2009/12/14 00:49:45 christos Exp $	*/
 /*
  * ntpq_ops.c - subroutines which are called to perform operations by ntpq
  */
 #include <stdio.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include "ntp_stdlib.h"
 #include "ntpq.h"
 #include "ntpq-opts.h"
-extern char *	chosts[];
+extern const char *	chosts[];
 extern char currenthost[];
 extern int	numhosts;
 int 	maxhostlen;
 /*
  * Declarations for command handlers in here
  */
 static	int	checkassocid	(u_int32);
 static	struct varlist *findlistvar (struct varlist *, char *);
 static	void	doaddvlist	(struct varlist *, char *);
 static	void	dormvlist	(struct varlist *, char *);
 static	void	doclearvlist	(struct varlist *);
 static	void	makequerydata	(struct varlist *, int *, char *);
 static	int	doquerylist	(struct varlist *, int, int, int,
 				 u_short *, int *, char **);
 static	void	doprintvlist	(struct varlist *, FILE *);
 static	void	addvars 	(struct parse *, FILE *);
 static	void	rmvars		(struct parse *, FILE *);
 static	void	clearvars	(struct parse *, FILE *);
 static	void	showvars	(struct parse *, FILE *);
 static	int	dolist		(struct varlist *, int, int, int,
 				 FILE *);
 static	void	readlist	(struct parse *, FILE *);
 static	void	writelist	(struct parse *, FILE *);
 static	void	readvar 	(struct parse *, FILE *);
 static	void	writevar	(struct parse *, FILE *);
 static	void	clocklist	(struct parse *, FILE *);
 static	void	clockvar	(struct parse *, FILE *);
 static	int	findassidrange	(u_int32, u_int32, int *, int *);
 static	void	mreadlist	(struct parse *, FILE *);
 static	void	mreadvar	(struct parse *, FILE *);
 static	int	dogetassoc	(FILE *);
 static	void	printassoc	(int, FILE *);
 static	void	associations	(struct parse *, FILE *);
 static	void	lassociations	(struct parse *, FILE *);
 static	void	passociations	(struct parse *, FILE *);
 static	void	lpassociations	(struct parse *, FILE *);
 #ifdef	UNUSED
 static	void	radiostatus (struct parse *, FILE *);
 #endif	/* UNUSED */
 static	void	pstatus 	(struct parse *, FILE *);
 static	long	when		(l_fp *, l_fp *, l_fp *);
 static	char *	prettyinterval	(char *, long);
 static	int	doprintpeers	(struct varlist *, int, int, int, char *, FILE *, int);
 static	int	dogetpeers	(struct varlist *, int, FILE *, int);
 static	void	dopeers 	(int, FILE *, int);
 static	void	peers		(struct parse *, FILE *);
 static	void	lpeers		(struct parse *, FILE *);
 static	void	doopeers	(int, FILE *, int);
 static	void	opeers		(struct parse *, FILE *);
 static	void	lopeers 	(struct parse *, FILE *);
 static  void	config		(struct parse *, FILE *);
 static 	void 	saveconfig	(struct parse *, FILE *);
 static  void	config_from_file(struct parse *, FILE *);
 /*
  * Commands we understand.	Ntpdc imports this.
  */
 struct xcmd opcmds[] = {
 	{ "saveconfig", saveconfig, { NTP_STR, NO, NO, NO },
 		{ "filename", "", "", ""},
 		"save ntpd configuration to file, . for current config file"},
 	{ "associations", associations, {  NO, NO, NO, NO },
 	  { "", "", "", "" },
 	  "print list of association ID's and statuses for the server's peers" },
 	{ "passociations", passociations,   {  NO, NO, NO, NO },
 	  { "", "", "", "" },
 	  "print list of associations returned by last associations command" },
 	{ "lassociations", lassociations,   {  NO, NO, NO, NO },
 	  { "", "", "", "" },
 	  "print list of associations including all client information" },
 	{ "lpassociations", lpassociations, {  NO, NO, NO, NO },
 	  { "", "", "", "" },
 	  "print last obtained list of associations, including client information" },
 	{ "addvars",    addvars,    { NTP_STR, NO, NO, NO },
 	  { "name[=value][,...]", "", "", "" },
 	  "add variables to the variable list or change their values" },
 	{ "rmvars", rmvars,     { NTP_STR, NO, NO, NO },
 	  { "name[,...]", "", "", "" },
 	  "remove variables from the variable list" },
 	{ "clearvars",  clearvars,  { NO, NO, NO, NO },
 	  { "", "", "", "" },
 	  "remove all variables from the variable list" },
 	{ "showvars",   showvars,   { NO, NO, NO, NO },
 	  { "", "", "", "" },
 	  "print variables on the variable list" },
 	{ "readlist",   readlist,   { OPT|NTP_UINT, NO, NO, NO },
 	  { "assocID", "", "", "" },
 	  "read the system or peer variables included in the variable list" },
 	{ "rl",     readlist,   { OPT|NTP_UINT, NO, NO, NO },
 	  { "assocID", "", "", "" },
 	  "read the system or peer variables included in the variable list" },
 	{ "writelist",  writelist,  { OPT|NTP_UINT, NO, NO, NO },
 	  { "assocID", "", "", "" },
 	  "write the system or peer variables included in the variable list" },
 	{ "readvar",    readvar,    { OPT|NTP_UINT, OPT|NTP_STR, NO, NO },
 	  { "assocID", "name=value[,...]", "", "" },
 	  "read system or peer variables" },
 	{ "rv",     readvar,    { OPT|NTP_UINT, OPT|NTP_STR, NO, NO },
 	  { "assocID", "name=value[,...]", "", "" },
 	  "read system or peer variables" },
 	{ "writevar",   writevar,   { NTP_UINT, NTP_STR, NO, NO },
 	  { "assocID", "name=value,[...]", "", "" },
 	  "write system or peer variables" },
 	{ "mreadlist",  mreadlist,  { NTP_UINT, NTP_UINT, NO, NO },
 	  { "assocID", "assocID", "", "" },
 	  "read the peer variables in the variable list for multiple peers" },
 	{ "mrl",    mreadlist,  { NTP_UINT, NTP_UINT, NO, NO },
 	  { "assocID", "assocID", "", "" },
 	  "read the peer variables in the variable list for multiple peers" },
 	{ "mreadvar",   mreadvar,   { NTP_UINT, NTP_UINT, OPT|NTP_STR, NO },
 	  { "assocID", "assocID", "name=value[,...]", "" },
 	  "read peer variables from multiple peers" },
 	{ "mrv",    mreadvar,   { NTP_UINT, NTP_UINT, OPT|NTP_STR, NO },
 	  { "assocID", "assocID", "name=value[,...]", "" },
 	  "read peer variables from multiple peers" },
 	{ "clocklist",  clocklist,  { OPT|NTP_UINT, NO, NO, NO },
 	  { "assocID", "", "", "" },
 	  "read the clock variables included in the variable list" },
 	{ "cl",     clocklist,  { OPT|NTP_UINT, NO, NO, NO },
 	  { "assocID", "", "", "" },
 	  "read the clock variables included in the variable list" },
 	{ "clockvar",   clockvar,   { OPT|NTP_UINT, OPT|NTP_STR, NO, NO },
 	  { "assocID", "name=value[,...]", "", "" },
 	  "read clock variables" },
 	{ "cv",     clockvar,   { OPT|NTP_UINT, OPT|NTP_STR, NO, NO },
 	  { "assocID", "name=value[,...]", "", "" },
 	  "read clock variables" },
 	{ "pstatus",    pstatus,    { NTP_UINT, NO, NO, NO },
 	  { "assocID", "", "", "" },
 	  "print status information returned for a peer" },
 	{ "peers",  peers,      { OPT|IP_VERSION, NO, NO, NO },
 	  { "-4|-6", "", "", "" },
 	  "obtain and print a list of the server's peers [IP version]" },
 	{ "lpeers", lpeers,     { OPT|IP_VERSION, NO, NO, NO },
 	  { "-4|-6", "", "", "" },
 	  "obtain and print a list of all peers and clients [IP version]" },
 	{ "opeers", opeers,     { OPT|IP_VERSION, NO, NO, NO },
 	  { "-4|-6", "", "", "" },
 	  "print peer list the old way, with dstadr shown rather than refid [IP version]" },
 	{ "lopeers", lopeers,   { OPT|IP_VERSION, NO, NO, NO },
 	  { "-4|-6", "", "", "" },
 	  "obtain and print a list of all peers and clients showing dstadr [IP version]" },
 	{ ":config", config,   { NTP_STR, NO, NO, NO },
 	  { "<configuration command line>", "", "", "" },
 	  "send a remote configuration command to ntpd" },
 	{ "config-from-file", config_from_file, { NTP_STR, NO, NO, NO },
 	  { "<configuration filename>", "", "", "" },
 	  "configure ntpd using the configuration filename" },
 	{ 0,		0,		{ NO, NO, NO, NO },
 	  { "-4|-6", "", "", "" }, "" }
 };
 /*
  * Variable list data space
  */
 #define MAXLINE     512  /* maximum length of a line */
 #define MAXLIST 	64	/* maximum number of variables in list */
 #define LENHOSTNAME 256 /* host name is 256 characters long */
 /*
  * Old CTL_PST defines for version 2.
  */
 #define OLD_CTL_PST_CONFIG		0x80
 #define OLD_CTL_PST_AUTHENABLE		0x40
 #define OLD_CTL_PST_AUTHENTIC		0x20
 #define OLD_CTL_PST_REACH		0x10
 #define OLD_CTL_PST_SANE		0x08
 #define OLD_CTL_PST_DISP		0x04
 #define OLD_CTL_PST_SEL_REJECT		0
 #define OLD_CTL_PST_SEL_SELCAND 	1
 #define OLD_CTL_PST_SEL_SYNCCAND	2
 #define OLD_CTL_PST_SEL_SYSPEER 	3
 char flash2[] = " .+*    "; /* flash decode for version 2 */
 char flash3[] = " x.-+#*o"; /* flash decode for peer status version 3 */
 struct varlist {
 	char *name;
 	char *value;
 } g_varlist[MAXLIST] = { { 0, 0 } };
 /*
  * Imported from ntpq.c
  */
 extern int showhostnames;
 extern int rawmode;
 extern struct servent *server_entry;
 extern struct association assoc_cache[];
 extern int numassoc;
 extern u_char pktversion;
 extern struct ctl_var peer_var[];
 /*
  * For quick string comparisons
  */
 #define STREQ(a, b) (*(a) == *(b) && strcmp((a), (b)) == 0)
 /*
  * checkassocid - return the association ID, checking to see if it is valid
  */
 static int
 checkassocid(
 	u_int32 value
+	)
+{
 	if (value == 0 || value >= 65536) {
 		(void) fprintf(stderr, "***Invalid association ID specified\n");
 		return 0;
+	}
 	return (int)value;
+}
 /*
  * findlistvar - look for the named variable in a list and return if found
  */
 static struct varlist *
 findlistvar(
 	struct varlist *list,
 	char *name
+	)
+{
 	register struct varlist *vl;
 	for (vl = list; vl < list + MAXLIST && vl->name != 0; vl++)
 		if (STREQ(name, vl->name))
 		return vl;
 	if (vl < list + MAXLIST)
 		return vl;
 	return (struct varlist *)0;
+}
 /*
  * doaddvlist - add variable(s) to the variable list
  */
 static void
 doaddvlist(
 	struct varlist *vlist,
 	char *vars
+	)
+{
 	register struct varlist *vl;
 	int len;
 	char *name;
 	char *value;
 	len = strlen(vars);
 	while (nextvar(&len, &vars, &name, &value)) {
 		vl = findlistvar(vlist, name);
 		if (vl == 0) {
 			(void) fprintf(stderr, "Variable list full\n");
 			return;
+		}
 		if (vl->name == 0) {
 			vl->name = estrdup(name);
 		} else if (vl->value != 0) {
 			free(vl->value);
 			vl->value = 0;
+		}
 		if (value != 0)
 			vl->value = estrdup(value);
+	}
+}
 /*
  * dormvlist - remove variable(s) from the variable list
  */
 static void
 dormvlist(
 	struct varlist *vlist,
 	char *vars
+	)
+{
 	register struct varlist *vl;
 	int len;
 	char *name;
 	char *value;
 	len = strlen(vars);
 	while (nextvar(&len, &vars, &name, &value)) {
 		vl = findlistvar(vlist, name);
 		if (vl == 0 || vl->name == 0) {
 			(void) fprintf(stderr, "Variable `%s' not found\n",
 				       name);
 		} else {
 			free((void *)vl->name);
 			if (vl->value != 0)
 			    free(vl->value);
 			for ( ; (vl+1) < (g_varlist + MAXLIST)
 				      && (vl+1)->name != 0; vl++) {
 				vl->name = (vl+1)->name;
 				vl->value = (vl+1)->value;
+			}
 			vl->name = vl->value = 0;
+		}
+	}
+}
 /*
  * doclearvlist - clear a variable list
  */
 static void
 doclearvlist(
 	struct varlist *vlist
+	)
+{
 	register struct varlist *vl;
 	for (vl = vlist; vl < vlist + MAXLIST && vl->name != 0; vl++) {
 		free((void *)vl->name);
 		vl->name = 0;
 		if (vl->value != 0) {
 			free(vl->value);
 			vl->value = 0;
+		}
+	}
+}
 /*
  * makequerydata - form a data buffer to be included with a query
  */
 static void
 makequerydata(
 	struct varlist *vlist,
 	int *datalen,
 	char *data
+	)
+{
 	register struct varlist *vl;
 	register char *cp, *cpend;
 	register int namelen, valuelen;
 	register int totallen;
 	cp = data;
 	cpend = data + *datalen;
 	for (vl = vlist; vl < vlist + MAXLIST && vl->name != 0; vl++) {
 		namelen = strlen(vl->name);
 		if (vl->value == 0)
 			valuelen = 0;
 		else
 			valuelen = strlen(vl->value);
 		totallen = namelen + valuelen + (valuelen != 0) + (cp != data);
 		if (cp + totallen > cpend)
 			break;
 		if (cp != data)
 			*cp++ = ',';
 		memmove(cp, vl->name, (unsigned)namelen);
 		cp += namelen;
 		if (valuelen != 0) {
 			*cp++ = '=';
 			memmove(cp, vl->value, (unsigned)valuelen);
 			cp += valuelen;
+		}
+	}
 	*datalen = cp - data;
+}
 /*
  * doquerylist - send a message including variables in a list
  */
 static int
 doquerylist(
 	struct varlist *vlist,
 	int op,
 	int associd,
 	int auth,
 	u_short *rstatus,
 	int *dsize,
 	char **datap
+	)
+{
 	char data[CTL_MAX_DATA_LEN];
 	int datalen;
 	datalen = sizeof(data);
 	makequerydata(vlist, &datalen, data);
 	return doquery(op, associd, auth, datalen, data, rstatus,
 			   dsize, datap);
+}
 /*
  * doprintvlist - print the variables on a list
  */
 static void
 doprintvlist(
 	struct varlist *vlist,
 	FILE *fp
+	)
+{
 	register struct varlist *vl;
 	if (vlist->name == 0) {
 		(void) fprintf(fp, "No variables on list\n");
 	} else {
 		for (vl = vlist; vl < vlist + MAXLIST && vl->name != 0; vl++) {
 			if (vl->value == 0) {
 				(void) fprintf(fp, "%s\n", vl->name);
 			} else {
 				(void) fprintf(fp, "%s=%s\n",
 						   vl->name, vl->value);
+			}
+		}
+	}
+}
 /*
  * addvars - add variables to the variable list
  */
 /*ARGSUSED*/
 static void
 addvars(
 	struct parse *pcmd,
 	FILE *fp
+	)
+{
 	doaddvlist(g_varlist, pcmd->argval[0].string);
+}
 /*
  * rmvars - remove variables from the variable list
  */
 /*ARGSUSED*/
 static void
 rmvars(
 	struct parse *pcmd,
 	FILE *fp
+	)
+{
 	dormvlist(g_varlist, pcmd->argval[0].string);
+}
 /*
  * clearvars - clear the variable list
  */
 /*ARGSUSED*/
 static void
 clearvars(
 	struct parse *pcmd,
 	FILE *fp
+	)
+{
 	doclearvlist(g_varlist);
+}
 /*
  * showvars - show variables on the variable list
  */
 /*ARGSUSED*/
 static void
 showvars(
 	struct parse *pcmd,
 	FILE *fp
+	)
+{
 	doprintvlist(g_varlist, fp);
+}
 /*
  * dolist - send a request with the given list of variables
  */
 static int
 dolist(
 	struct varlist *vlist,
 	int associd,
 	int op,
 	int type,
 	FILE *fp
+	)
+{
 	char *datap;
 	int res;
 	int dsize;
 	u_short rstatus;
 	int quiet;
 	/*
 	 * if we're asking for specific variables don't include the
 	 * status header line in the output.
 	 */
 	if (old_rv)
 		quiet = 0;
 	else
 		quiet = (vlist->name != NULL);
 	res = doquerylist(vlist, op, associd, 0, &rstatus, &dsize, &datap);
 	if (res != 0)
 		return 0;
 	if (numhosts > 1)
 		(void) fprintf(fp, "server=%s ", currenthost);
 	if (dsize == 0) {
 		if (associd == 0)
 			(void) fprintf(fp, "No system%s variables returned\n",
 				   (type == TYPE_CLOCK) ? " clock" : "");
 		else
 			(void) fprintf(fp,
 				   "No information returned for%s association %u\n",
 				   (type == TYPE_CLOCK) ? " clock" : "", associd);
 		return 1;
+	}
 	if (!quiet)
 		fprintf(fp,"associd=%d ",associd);
 	printvars(dsize, datap, (int)rstatus, type, quiet, fp);
 	return 1;
+}
 /*
  * readlist - send a read variables request with the variables on the list
  */
 static void
 readlist(
 	struct parse *pcmd,
 	FILE *fp
+	)
+{
 	int associd;
 	if (pcmd->nargs == 0) {
 		associd = 0;
 	} else {
 	  /* HMS: I think we want the u_int32 target here, not the u_long */
 		if (pcmd->argval[0].uval == 0)
 			associd = 0;
 		else if ((associd = checkassocid(pcmd->argval[0].uval)) == 0)
 			return;
+	}
 	(void) dolist(g_varlist, associd, CTL_OP_READVAR,
 			  (associd == 0) ? TYPE_SYS : TYPE_PEER, fp);
+}
 /*
  * writelist - send a write variables request with the variables on the list
  */
 static void
 writelist(
 	struct parse *pcmd,
 	FILE *fp
+	)
+{
 	char *datap;
 	int res;
 	int associd;
 	int dsize;
 	u_short rstatus;
 	if (pcmd->nargs == 0) {
 		associd = 0;
 	} else {
 		/* HMS: Do we really want uval here? */
 		if (pcmd->argval[0].uval == 0)
 			associd = 0;
 		else if ((associd = checkassocid(pcmd->argval[0].uval)) == 0)
 			return;
+	}
 	res = doquerylist(g_varlist, CTL_OP_WRITEVAR, associd, 1, &rstatus,
 			  &dsize, &datap);
 	if (res != 0)
 		return;
 	if (numhosts > 1)
 		(void) fprintf(fp, "server=%s ", currenthost);
 	if (dsize == 0)
 		(void) fprintf(fp, "done! (no data returned)\n");
 	else {
 		(void) fprintf(fp,"associd=%d ",associd);
 		printvars(dsize, datap, (int)rstatus,
 			  (associd != 0) ? TYPE_PEER : TYPE_SYS, 0, fp);
+	}
 	return;
+}
 /*
  * readvar - send a read variables request with the specified variables
  */
 static void
 readvar(
 	struct parse *pcmd,
 	FILE *fp
+	)
+{
 	int associd;
 	struct varlist tmplist[MAXLIST];
 	/* HMS: uval? */
 	if (pcmd->nargs == 0 || pcmd->argval[0].uval == 0)
 		associd = 0;
 	else if ((associd = checkassocid(pcmd->argval[0].uval)) == 0)
 		return;
 	memset((char *)tmplist, 0, sizeof(tmplist));
 	if (pcmd->nargs >= 2)
 		doaddvlist(tmplist, pcmd->argval[1].string);
 	(void) dolist(tmplist, associd, CTL_OP_READVAR,
 			  (associd == 0) ? TYPE_SYS : TYPE_PEER, fp);
 	doclearvlist(tmplist);
+}
 /*
  * writevar - send a write variables request with the specified variables
  */
 static void
 writevar(
 	struct parse *pcmd,
 	FILE *fp
+	)
+{
 	char *datap;
 	int res;
 	int associd;
 	int dsize;
 	u_short rstatus;
 	struct varlist tmplist[MAXLIST];
 	/* HMS: uval? */
 	if (pcmd->argval[0].uval == 0)
 		associd = 0;
 	else if ((associd = checkassocid(pcmd->argval[0].uval)) == 0)
 		return;
 	memset((char *)tmplist, 0, sizeof(tmplist));
 	doaddvlist(tmplist, pcmd->argval[1].string);
 	res = doquerylist(tmplist, CTL_OP_WRITEVAR, associd, 1, &rstatus,
 			  &dsize, &datap);
 	doclearvlist(tmplist);
 	if (res != 0)
 		return;
 	if (numhosts > 1)
 		(void) fprintf(fp, "server=%s ", currenthost);
 	if (dsize == 0)
 		(void) fprintf(fp, "done! (no data returned)\n");
 	else {
 		(void) fprintf(fp,"associd=%d ",associd);
 		printvars(dsize, datap, (int)rstatus,
 			  (associd != 0)
 			      ? TYPE_PEER
 			      : TYPE_SYS,
 , fp);
+	}
 	return;
+}
 /*
  * clocklist - send a clock variables request with the variables on the list
  */
 static void
 clocklist(
 	struct parse *pcmd,
 	FILE *fp
+	)
+{
 	int associd;
 	/* HMS: uval? */
 	if (pcmd->nargs == 0) {
 		associd = 0;
 	} else {
 		if (pcmd->argval[0].uval == 0)
 			associd = 0;
 		else if ((associd = checkassocid(pcmd->argval[0].uval)) == 0)
 			return;
+	}
 	(void) dolist(g_varlist, associd, CTL_OP_READCLOCK, TYPE_CLOCK, fp);
+}
 /*
  * clockvar - send a clock variables request with the specified variables
  */
 static void
 clockvar(
 	struct parse *pcmd,
 	FILE *fp
+	)
+{
 	int associd;
 	struct varlist tmplist[MAXLIST];
 	/* HMS: uval? */
 	if (pcmd->nargs == 0 || pcmd->argval[0].uval == 0)
 		associd = 0;
 	else if ((associd = checkassocid(pcmd->argval[0].uval)) == 0)
 		return;
 	memset((char *)tmplist, 0, sizeof(tmplist));
 	if (pcmd->nargs >= 2)
 		doaddvlist(tmplist, pcmd->argval[1].string);
 	(void) dolist(tmplist, associd, CTL_OP_READCLOCK, TYPE_CLOCK, fp);
 	doclearvlist(tmplist);
+}
 /*
  * findassidrange - verify a range of association ID's
  */
 static int
 findassidrange(
 	u_int32 assid1,
 	u_int32 assid2,
 	int *from,
 	int *to
+	)
+{
 	register int i;
 	int f, t;
 	if (assid1 == 0 || assid1 > 65535) {
 		(void) fprintf(stderr,
 				   "***Invalid association ID %lu specified\n", (u_long)assid1);
 		return 0;
+	}
 	if (assid2 == 0 || assid2 > 65535) {
 	fprintf(stderr,
 	    "***Invalid association ID %lu specified\n", (u_long)assid2);
 		return 0;
+	}
 	f = t = -1;
 	for (i = 0; i < numassoc; i++) {
 		if (assoc_cache[i].assid == assid1) {
 			f = i;
 			if (t != -1)
 				break;
+		}
 		if (assoc_cache[i].assid == assid2) {
 			t = i;
 			if (f != -1)
 				break;
+		}
+	}
 	if (f == -1 || t == -1) {
 		(void) fprintf(stderr,
 				   "***Association ID %lu not found in list\n",
 				   (f == -1) ? (u_long)assid1 : (u_long)assid2);
 		return 0;
+	}
 	if (f < t) {
 		*from = f;
 		*to = t;
 	} else {
 		*from = t;
 		*to = f;
+	}
 	return 1;
+}
 /*
  * mreadlist - send a read variables request for multiple associations
  */
 static void
 mreadlist(
 	struct parse *pcmd,
 	FILE *fp
+	)
+{
 	int i;
 	int from;
 	int to;
 	/* HMS: uval? */
 	if (!findassidrange(pcmd->argval[0].uval, pcmd->argval[1].uval,
 				&from, &to))
 		return;
 	for (i = from; i <= to; i++) {
 		if (i != from)
 			(void) fprintf(fp, "\n");
 		if (!dolist(g_varlist, (int)assoc_cache[i].assid,
 				CTL_OP_READVAR, TYPE_PEER, fp))
 			return;
+	}
 	return;
+}
 /*
  * mreadvar - send a read variables request for multiple associations
  */
 static void
 mreadvar(
 	struct parse *pcmd,
 	FILE *fp
+	)
+{
 	int i;
 	int from;
 	int to;
 	struct varlist tmplist[MAXLIST];
 	/* HMS: uval? */
 	if (!findassidrange(pcmd->argval[0].uval, pcmd->argval[1].uval,
 				&from, &to))
 		return;
 	memset((char *)tmplist, 0, sizeof(tmplist));
 	if (pcmd->nargs >= 3)
 		doaddvlist(tmplist, pcmd->argval[2].string);
 	for (i = from; i <= to; i++) {
 		if (i != from)
 			(void) fprintf(fp, "\n");
 		if (!dolist(g_varlist, (int)assoc_cache[i].assid,
 				CTL_OP_READVAR, TYPE_PEER, fp))
 			break;
+	}
 	doclearvlist(tmplist);
 	return;
+}
 /*
  * dogetassoc - query the host for its list of associations
  */
 static int
 dogetassoc(
 	FILE *fp
+	)
+{
 	char *datap;
 	int res;
 	int dsize;
 	u_short rstatus;
 	res = doquery(CTL_OP_READSTAT, 0, 0, 0, (char *)0, &rstatus,
 			  &dsize, &datap);
 	if (res != 0)
 		return 0;
 	if (dsize == 0) {
 		if (numhosts > 1)
 			(void) fprintf(fp, "server=%s ", currenthost);
 		(void) fprintf(fp, "No association ID's returned\n");
 		return 0;
+	}
 	if (dsize & 0x3) {
 		if (numhosts > 1)
 			(void) fprintf(stderr, "server=%s ", currenthost);
 		(void) fprintf(stderr,
 				   "***Server returned %d octets, should be multiple of 4\n",
 				   dsize);
 		return 0;
+	}
 	numassoc = 0;
 	while (dsize > 0) {
 		assoc_cache[numassoc].assid = ntohs(*((u_short *)datap));
 		datap += sizeof(u_short);
 		assoc_cache[numassoc].status = ntohs(*((u_short *)datap));
 		datap += sizeof(u_short);
 		if (++numassoc >= MAXASSOC)
 			break;
 		dsize -= sizeof(u_short) + sizeof(u_short);
+	}
 	sortassoc();
 	return 1;
+}
 /*
  * printassoc - print the current list of associations
  */
 static void
 printassoc(
 	int showall,
 	FILE *fp
+	)
+{
 	register char *bp;
 	int i;
 	u_char statval;
 	int event;
 	u_long event_count;
 	const char *conf;
 	const char *reach;
 	const char *auth;
 	const char *condition = "";
 	const char *last_event;
 	const char *cnt;
 	char buf[128];
 	if (numassoc == 0) {
 		(void) fprintf(fp, "No association ID's in list\n");
 		return;
+	}
 	/*
 	 * Output a header
 	 */
 	(void) fprintf(fp,
 			   "\nind assid status  conf reach auth condition  last_event cnt\n");
 	(void) fprintf(fp,
 			   "===========================================================\n");
 	for (i = 0; i < numassoc; i++) {
 		statval = (u_char) CTL_PEER_STATVAL(assoc_cache[i].status);
 		if (!showall && !(statval & (CTL_PST_CONFIG|CTL_PST_REACH)))
 			continue;
 		event = CTL_PEER_EVENT(assoc_cache[i].status);
 		event_count = CTL_PEER_NEVNT(assoc_cache[i].status);
 		if (statval & CTL_PST_CONFIG)
 			conf = "yes";
 		else
 			conf = "no";
 		if (statval & CTL_PST_BCAST) {
 			reach = "none";
 			if (statval & CTL_PST_AUTHENABLE)
 				auth = "yes";
 			else
 				auth = "none";
 		} else {
 			if (statval & CTL_PST_REACH)
 				reach = "yes";
 			else
 				reach = "no";
 			if (statval & CTL_PST_AUTHENABLE) {
 				if (statval & CTL_PST_AUTHENTIC)
 					auth = "ok ";
 				else
 					auth = "bad";
 			} else {
 				auth = "none";
+			}
+		}
 		if (pktversion > NTP_OLDVERSION) {
 			switch (statval & 0x7) {
 			case CTL_PST_SEL_REJECT:
 				condition = "reject";
 				break;
 			case CTL_PST_SEL_SANE:
 				condition = "falsetick";
 				break;
 			case CTL_PST_SEL_CORRECT:
 				condition = "excess";
 				break;
 			case CTL_PST_SEL_SELCAND:
 				condition = "outlyer";
 				break;
 			case CTL_PST_SEL_SYNCCAND:
 				condition = "candidate";
 				break;
 			case CTL_PST_SEL_EXCESS:
 				condition = "backup";
 				break;
 			case CTL_PST_SEL_SYSPEER:
 				condition = "sys.peer";
 				break;