 @@ -1,14 +1,14 @@
-/*	$NetBSD: ntp_request.c,v 1.1.1.1 2009/12/13 16:55:40 kardel Exp $	*/
+/*	$NetBSD: ntp_request.c,v 1.2 2009/12/14 00:46:21 christos Exp $	*/
 /*
  * ntp_request.c - respond to information requests
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_request.h"
 #include "ntp_control.h"
 @@ -401,27 +401,26 @@ get_packet_mode(struct recvbuf *rbufp)
 	return (INFO_MODE(inpkt->rm_vn_mode));
+}
 /*
  * process_private - process private mode (7) packets
  */
 void
 process_private(
 	struct recvbuf *rbufp,
 	int mod_okay
+	)
+{
 	static u_long quiet_until;
 	struct req_pkt *inpkt;
 	struct req_pkt_tail *tailinpkt;
 	sockaddr_u *srcadr;
 	struct interface *inter;
 	struct req_proc *proc;
 	int ec;
 	short temp_size;
 	l_fp ftmp;
 	double dtemp;
 	size_t recv_len;
 	size_t noslop_len;
 	size_t mac_len;
 @@ -440,34 +439,28 @@ process_private(
 	 * Do some sanity checks on the packet.  Return a format
 	 * error if it fails.
 	 */
 	ec = 0;
 	if (   (++ec, ISRESPONSE(inpkt->rm_vn_mode))
 	    || (++ec, ISMORE(inpkt->rm_vn_mode))
 	    || (++ec, INFO_VERSION(inpkt->rm_vn_mode) > NTP_VERSION)
 	    || (++ec, INFO_VERSION(inpkt->rm_vn_mode) < NTP_OLDVERSION)
 	    || (++ec, INFO_SEQ(inpkt->auth_seq) != 0)
 	    || (++ec, INFO_ERR(inpkt->err_nitems) != 0)
 	    || (++ec, INFO_MBZ(inpkt->mbz_itemsize) != 0)
 	    || (++ec, rbufp->recv_length < REQ_LEN_HDR)
 		) {
-		NLOG(NLOG_SYSEVENT)
+		msyslog(LOG_ERR, "process_private: INFO_ERR_FMT: test %d failed, pkt from %s", ec, stoa(srcadr));
-			if (current_time >= quiet_until) {
+		req_ack(srcadr, inter, inpkt, INFO_ERR_FMT);
 				msyslog(LOG_ERR,
 					"process_private: drop test %d"
 					" failed, pkt from %s",
 					ec, stoa(srcadr));
 				quiet_until = current_time + 60;
 		return;
+	}
 	reqver = INFO_VERSION(inpkt->rm_vn_mode);
 	/*
 	 * Get the appropriate procedure list to search.
 	 */
 	if (inpkt->implementation == IMPL_UNIV)
 		proc = univ_codes;
 	else if ((inpkt->implementation == IMPL_XNTPD) ||
 		 (inpkt->implementation == IMPL_XNTPD_OLD))
 		proc = ntp_codes;
 @@ -1173,27 +1166,27 @@ sys_stats(
 static void
 mem_stats(
 	sockaddr_u *srcadr,
 	struct interface *inter,
 	struct req_pkt *inpkt
+	)
+{
 	register struct info_mem_stats *ms;
 	register int i;
 	/*
 	 * Importations from the peer module
 	 */
-	extern int peer_hash_count[NTP_HASH_SIZE];
+	extern int peer_hash_count[];
 	extern int peer_free_count;
 	extern u_long peer_timereset;
 	extern u_long findpeer_calls;
 	extern u_long peer_allocations;
 	extern u_long peer_demobilizations;
 	extern int total_peer_structs;
 	ms = (struct info_mem_stats *)prepare_pkt(srcadr, inter, inpkt,
 						  sizeof(struct info_mem_stats));
 	ms->timereset = htonl((u_int32)(current_time - peer_timereset));
 	ms->totalpeermem = htons((u_short)total_peer_structs);
 	ms->freepeermem = htons((u_short)peer_free_count);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: refclock_arc.c,v 1.1.1.1 2009/12/13 16:55:44 kardel Exp $	*/
+/*	$NetBSD: refclock_arc.c,v 1.2 2009/12/14 00:46:21 christos Exp $	*/
 /*
  * refclock_arc - clock driver for ARCRON MSF/DCF/WWVB receivers
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 #if defined(REFCLOCK) && defined(CLOCK_ARCRON_MSF)
 static const char arc_version[] = { "V1.3 2003/02/21" };
 @@ -821,35 +821,35 @@ send_slow(
 		return(0);			/* FAILED! */
+	}
 	/* Copy in the command to be sent. */
 	while(*s && spaceleft > 0) { up->cmdqueue[CMDQUEUELEN - spaceleft--] = *s++; }
 	return(1);
+}
 static int
 get2(char *p, int *val)
+{
-  if (!isdigit((int)p[0]) || !isdigit((int)p[1])) return 0;
+  if (!isdigit((unsigned char)p[0]) || !isdigit((unsigned char)p[1])) return 0;
   *val = (p[0] - '0') * 10 + p[1] - '0';
   return 1;
+}
 static int
 get1(char *p, int *val)
+{
-  if (!isdigit((int)p[0])) return 0;
+  if (!isdigit((unsigned char)p[0])) return 0;
   *val = p[0] - '0';
   return 1;
+}
 /* Macro indicating action we will take for different quality values. */
 #define quality_action(q) \
 (((q) == QUALITY_UNKNOWN) ?         "UNKNOWN, will use clock anyway" : \
  (((q) < MIN_CLOCK_QUALITY_OK) ? "TOO POOR, will not use clock" : \
   "OK, will use clock"))
 /*
  * arc_receive - receive data from the serial interface
  */
 @@ -921,27 +921,27 @@ arc_receive(
 	c = rbufp->recv_buffer[0];
 	if((pp->a_lastcode[0] == 'o') &&
 #ifndef ARCRON_MULTIPLE_SAMPLES
 	   (pp->lencode == 1) &&
 #endif
 	   ((pp->lencode != 1) || (c != '\r')) &&
 	   (arc_last_offset >= 1)) {
 		/* Note that the timestamp should be corrected if >1 char rcvd. */
 		l_fp timestamp;
 		timestamp = rbufp->recv_time;
 #ifdef DEBUG
 		if(debug) { /* Show \r as `R', other non-printing char as `?'. */
 			printf("arc: stamp -->%c<-- (%d chars rcvd)\n",
-			       ((c == '\r') ? 'R' : (isgraph((int)c) ? c : '?')),
+			       ((c == '\r') ? 'R' : (isgraph((unsigned char)c) ? c : '?')),
 			       rbufp->recv_length);
+		}
 #endif
 		/*
 		  Now correct timestamp by offset of last byte received---we
 		  subtract from the receive time the delay implied by the
 		  extra characters received.
 		  Reject the input if the resulting code is too long, but
 		  allow for the trailing \r, normally not used but a good
 		  handle for tty_clk or somesuch kernel timestamper.
 		*/

 @@ -1,14 +1,14 @@
-/*	$NetBSD: refclock_heath.c,v 1.1.1.1 2009/12/13 16:55:48 kardel Exp $	*/
+/*	$NetBSD: refclock_heath.c,v 1.2 2009/12/14 00:46:21 christos Exp $	*/
 /*
  * refclock_heath - clock driver for Heath GC-1000
  * (but no longer the GC-1001 Model II, which apparently never worked)
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 #if defined(REFCLOCK) && defined(CLOCK_HEATH)
 #include "ntpd.h"
 @@ -369,27 +369,27 @@ heath_receive(
 	} else {
 		if (day > day2tab[month - 1]) {
 			refclock_report(peer, CEVNT_BADTIME);
 			return;
+		}
 		for (i = 0; i < month - 1; i++)
 		    day += day2tab[i];
+	}
 	pp->day = day;
 	/*
 	 * Determine synchronization and last update
 	 */
-	if (!isdigit((int)dsec))
+	if (!isdigit((unsigned char)dsec))
 		pp->leap = LEAP_NOTINSYNC;
 	else {
 		pp->nsec = (dsec - '0') * 100000000;
 		pp->leap = LEAP_NOWARNING;
+	}
 	if (!refclock_process(pp))
 		refclock_report(peer, CEVNT_BADTIME);
+}
 /*
  * heath_poll - called by the transmit procedure
  */

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: refclock_neoclock4x.c,v 1.1.1.1 2009/12/13 16:55:46 kardel Exp $ */	1	/* $NetBSD: refclock_neoclock4x.c,v 1.2 2009/12/14 00:46:21 christos Exp $ */
2		2
3	/*	3	/*
4	*	4	*
5	* Refclock_neoclock4x.c	5	* Refclock_neoclock4x.c
6	* - NeoClock4X driver for DCF77 or FIA Timecode	6	* - NeoClock4X driver for DCF77 or FIA Timecode
7	*	7	*
8	* Date: 2006-01-11 v1.15	8	* Date: 2006-01-11 v1.15
9	*	9	*
10	* see http://www.linum.com/redir/jump/id=neoclock4x&action=redir	10	* see http://www.linum.com/redir/jump/id=neoclock4x&action=redir
11	* for details about the NeoClock4X device	11	* for details about the NeoClock4X device
12	*	12	*
13	* Copyright (C) 2002-2004 by Linum Software GmbH <neoclock4x@linum.com>	13	* Copyright (C) 2002-2004 by Linum Software GmbH <neoclock4x@linum.com>
14	*	14	*
	@@ -784,45 +784,45 @@ neoclock4x_control(int unit,		@@ -784,45 +784,45 @@ neoclock4x_control(int unit,
784	snprintf(tt, 79, "serialnumber=\"%s\"", up->serial);	784	snprintf(tt, 79, "serialnumber=\"%s\"", up->serial);
785	}	785	}
786	}	786	}
787		787
788	static int	788	static int
789	neol_hexatoi_len(const char str[],	789	neol_hexatoi_len(const char str[],
790	int *result,	790	int *result,
791	int maxlen)	791	int maxlen)
792	{	792	{
793	int hexdigit;	793	int hexdigit;
794	int i;	794	int i;
795	int n = 0;	795	int n = 0;
796		796
797	for(i=0; isxdigit((int)str[i]) && i < maxlen; i++)	797	for(i=0; isxdigit((unsigned char)str[i]) && i < maxlen; i++)
798	{	798	{
799	hexdigit = isdigit((int)str[i]) ? toupper(str[i]) - '0' : toupper(str[i]) - 'A' + 10;	799	hexdigit = isdigit((unsigned char)str[i]) ? toupper((unsigned char)str[i]) - '0' : toupper((unsigned char)str[i]) - 'A' + 10;
800	n = 16 * n + hexdigit;	800	n = 16 * n + hexdigit;
801	}	801	}
802	*result = n;	802	*result = n;
803	return (n);	803	return (n);
804	}	804	}
805		805
806	static int	806	static int
807	neol_atoi_len(const char str[],	807	neol_atoi_len(const char str[],
808	int *result,	808	int *result,
809	int maxlen)	809	int maxlen)
810	{	810	{
811	int digit;	811	int digit;
812	int i;	812	int i;
813	int n = 0;	813	int n = 0;
814		814
815	for(i=0; isdigit((int)str[i]) && i < maxlen; i++)	815	for(i=0; isdigit((unsigned char)str[i]) && i < maxlen; i++)
816	{	816	{
817	digit = str[i] - '0';	817	digit = str[i] - '0';
818	n = 10 * n + digit;	818	n = 10 * n + digit;
819	}	819	}
820	*result = n;	820	*result = n;
821	return (n);	821	return (n);
822	}	822	}
823		823
824	/* Converts Gregorian date to seconds since 1970-01-01 00:00:00.	824	/* Converts Gregorian date to seconds since 1970-01-01 00:00:00.
825	* Assumes input in normal date format, i.e. 1980-12-31 23:59:59	825	* Assumes input in normal date format, i.e. 1980-12-31 23:59:59
826	* => year=1980, mon=12, day=31, hour=23, min=59, sec=59.	826	* => year=1980, mon=12, day=31, hour=23, min=59, sec=59.
827	*	827	*
828	* [For the Julian calendar (which was used in Russia before 1917,	828	* [For the Julian calendar (which was used in Russia before 1917,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: refclock_nmea.c,v 1.1.1.1 2009/12/13 16:55:55 kardel Exp $	*/
+/*	$NetBSD: refclock_nmea.c,v 1.2 2009/12/14 00:46:21 christos Exp $	*/
 /*
  * refclock_nmea.c - clock driver for an NMEA GPS CLOCK
  *		Michael Petry Jun 20, 1994
  *		 based on refclock_heathn.c
+ *
  * Updated to add support for Accord GPS Clock
  * 		Venu Gopal Dec 05, 2007
  * 		neo.venu@gmail.com, venugopal_d@pgad.gov.in
+ *
  * Updated to process 'time1' fudge factor
  *		Venu Gopal May 05, 2008
+ *
 @@ -16,26 +16,27 @@
  * from serial timecode fudge time2.
  *		Dave Hart July 1, 2009
  *		hart@ntp.org, davehart@davehart.com
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 #if defined(REFCLOCK) && defined(CLOCK_NMEA)
 #include <sys/stat.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <sys/socket.h>
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_unixtime.h"
 #include "ntp_refclock.h"
 #include "ntp_stdlib.h"
 #ifdef HAVE_PPSAPI
 # include "ppsapi_timepps.h"
 #include "refclock_atom.h"
 #endif /* HAVE_PPSAPI */
 #ifdef SYS_WINNT
 @@ -633,56 +634,56 @@ nmea_receive(
 			pp->leap = LEAP_NOWARNING;
 		/* Now point at the time field */
 		dp = field_parse(cp, 1);
 		break;
 	default:
 		return;
+	}
 	/*
 	 * Check time code format of NMEA
 	 */
-	if (!isdigit((int)dp[0]) ||
+	if (!isdigit((unsigned char)dp[0]) ||
-	    !isdigit((int)dp[1]) ||
+	    !isdigit((unsigned char)dp[1]) ||
-	    !isdigit((int)dp[2]) ||
+	    !isdigit((unsigned char)dp[2]) ||
-	    !isdigit((int)dp[3]) ||
+	    !isdigit((unsigned char)dp[3]) ||
-	    !isdigit((int)dp[4]) ||
+	    !isdigit((unsigned char)dp[4]) ||
-	    !isdigit((int)dp[5])) {
+	    !isdigit((unsigned char)dp[5])) {
 		DPRINTF(1, ("NMEA time code %c%c%c%c%c%c non-numeric",
 			    dp[0], dp[1], dp[2], dp[3], dp[4], dp[5]));
 		refclock_report(peer, CEVNT_BADTIME);
 		return;
+	}
 	/*
 	 * Convert time and check values.
 	 */
 	pp->hour = ((dp[0] - '0') * 10) + dp[1] - '0';
 	pp->minute = ((dp[2] - '0') * 10) + dp[3] -  '0';
 	pp->second = ((dp[4] - '0') * 10) + dp[5] - '0';
 	/*
 	 * Default to 0 milliseconds, if decimal convert milliseconds in
 	 * one, two or three digits
 	 */
 	pp->nsec = 0;
 	if (dp[6] == '.') {
-		if (isdigit((int)dp[7])) {
+		if (isdigit((unsigned char)dp[7])) {
 			pp->nsec = (dp[7] - '0') * 100000000;
-			if (isdigit((int)dp[8])) {
+			if (isdigit((unsigned char)dp[8])) {
 				pp->nsec += (dp[8] - '0') * 10000000;
-				if (isdigit((int)dp[9])) {
+				if (isdigit((unsigned char)dp[9])) {
 					pp->nsec += (dp[9] - '0') * 1000000;
+				}
+			}
+		}
+	}
 	/*
 	 * Manipulating GPS timestamp in GPZDG as the seconds field
 	 * is valid for next PPS tick. Just rolling back the second,
 	 * minute and hour fields appopriately
 	 */
 	if (cmdtypezdg) {
 		if (pp->second == 0) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: refclock_oncore.c,v 1.1.1.1 2009/12/13 16:55:54 kardel Exp $	*/
+/*	$NetBSD: refclock_oncore.c,v 1.2 2009/12/14 00:46:21 christos Exp $	*/
 /*
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):
  * <phk@FreeBSD.ORG> wrote this file.  As long as you retain this notice you
  * can do whatever you want with this stuff. If we meet some day, and you think
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
+ *
  * refclock_oncore.c
+ *
  * Driver for some of the various the Motorola Oncore GPS receivers.
  *   should work with Basic, PVT6, VP, UT, UT+, GT, GT+, SL, M12, M12+T
 @@ -1223,61 +1223,61 @@ oncore_read_config(
 		return;
+	}
 	mode = mask = 0;
 	lat_flg = long_flg = ht_flg = 0;
 	while (fgets(line, 100, fd)) {
 		/* Remove comments */
 		if ((cp = strchr(line, '#')))
 			*cp = '\0';
 		/* Remove trailing space */
 		for (i = strlen(line);
-		     i > 0 && isascii((int)line[i - 1]) && isspace((int)line[i - 1]);
+		     i > 0 && isascii((unsigned char)line[i - 1]) && isspace((unsigned char)line[i - 1]);
+			)
 			line[--i] = '\0';
 		/* Remove leading space */
-		for (cc = line; *cc && isascii((int)*cc) && isspace((int)*cc); cc++)
+		for (cc = line; *cc && isascii((unsigned char)*cc) && isspace((unsigned char)*cc); cc++)
 			continue;
 		/* Stop if nothing left */
 		if (!*cc)
 			continue;
 		/* Uppercase the command and find the arg */
 		for (ca = cc; *ca; ca++) {
-			if (isascii((int)*ca)) {
+			if (isascii((unsigned char)*ca)) {
-				if (islower((int)*ca)) {
+				if (islower((unsigned char)*ca)) {
-					*ca = toupper(*ca);
+					*ca = toupper((unsigned char)*ca);
-				} else if (isspace((int)*ca) || (*ca == '='))
+				} else if (isspace((unsigned char)*ca) || (*ca == '='))
 					break;
+			}
+		}
 		/* Remove space (and possible =) leading the arg */
-		for (; *ca && isascii((int)*ca) && (isspace((int)*ca) || (*ca == '=')); ca++)
+		for (; *ca && isascii((unsigned char)*ca) && (isspace((unsigned char)*ca) || (*ca == '=')); ca++)
 			continue;
 		if (!strncmp(cc, "STATUS", (size_t) 6) || !strncmp(cc, "SHMEM", (size_t) 5)) {
 			instance->shmem_fname = estrdup(ca);
 			continue;
+		}
 		/* Uppercase argument as well */
 		for (cp = ca; *cp; cp++)
-			if (isascii((int)*cp) && islower((int)*cp))
+			if (isascii((unsigned char)*cp) && islower((unsigned char)*cp))
-				*cp = toupper(*cp);
+				*cp = toupper((unsigned char)*cp);
 		if (!strncmp(cc, "LAT", (size_t) 3)) {
 			f1 = f2 = f3 = 0;
 			sscanf(ca, "%lf %lf %lf", &f1, &f2, &f3);
 			sign = 1;
 			if (f1 < 0) {
 				f1 = -f1;
 				sign = -1;
+			}
 			instance->ss_lat = sign*1000*(fabs(f3) + 60*(fabs(f2) + 60*f1)); /*miliseconds*/
 			lat_flg++;
 		} else if (!strncmp(cc, "LON", (size_t) 3)) {
 			f1 = f2 = f3 = 0;
 @@ -2887,27 +2887,27 @@ oncore_msg_Cj_id(
 	/* next, the Firmware Version and Revision numbers */
 	instance->version  = atoi((char *) &instance->Cj[83]);
 	instance->revision = atoi((char *) &instance->Cj[111]);
 	/* from model number decide which Oncore this is,
 		and then the number of channels */
 	for (cp= (char *) &instance->Cj[160]; *cp == ' '; cp++)   /* start right after 'Model #' */
+		;
 	cp1 = cp;
 	cp2 = Model;
-	for (; !isspace((int)*cp) && cp-cp1 < 20; cp++, cp2++)
+	for (; !isspace((unsigned char)*cp) && cp-cp1 < 20; cp++, cp2++)
 		*cp2 = *cp;
 	*cp2 = '\0';
 	cp = 0;
 	if (!strncmp(Model, "PVT6", (size_t) 4)) {
 		cp = "PVT6";
 		instance->model = ONCORE_PVT6;
 	} else if (Model[0] == 'A') {
 		cp = "Basic";
 		instance->model = ONCORE_BASIC;
 	} else if (Model[0] == 'B' || !strncmp(Model, "T8", (size_t) 2)) {
 		cp = "VP";
 		instance->model = ONCORE_VP;

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: refclock_parse.c,v 1.1.1.1 2009/12/13 16:56:00 kardel Exp $ */	1	/* $NetBSD: refclock_parse.c,v 1.2 2009/12/14 00:46:21 christos Exp $ */
2		2
3	/*	3	/*
4	* /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.81 2009/05/01 10:15:29 kardel RELEASE_20090105_A	4	* /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.81 2009/05/01 10:15:29 kardel RELEASE_20090105_A
5	*	5	*
6	* refclock_parse.c,v 4.81 2009/05/01 10:15:29 kardel RELEASE_20090105_A	6	* refclock_parse.c,v 4.81 2009/05/01 10:15:29 kardel RELEASE_20090105_A
7	*	7	*
8	* generic reference clock driver for several DCF/GPS/MSF/... receivers	8	* generic reference clock driver for several DCF/GPS/MSF/... receivers
9	*	9	*
10	* PPS notes:	10	* PPS notes:
11	* On systems that support PPSAPI (RFC2783) PPSAPI is the	11	* On systems that support PPSAPI (RFC2783) PPSAPI is the
12	* preferred interface.	12	* preferred interface.
13	*	13	*
14	* Optionally make use of a STREAMS module for input processing where	14	* Optionally make use of a STREAMS module for input processing where
	@@ -1480,27 +1480,27 @@ mkreadable(		@@ -1480,27 +1480,27 @@ mkreadable(
1480		1480
1481	if (blen < 4)	1481	if (blen < 4)
1482	return (char )0; / don't bother with mini buffers */	1482	return (char )0; / don't bother with mini buffers */
1483		1483
1484	endb = buffer + blen - 4;	1484	endb = buffer + blen - 4;
1485		1485
1486	blen--; /* account for '\0' */	1486	blen--; /* account for '\0' */
1487		1487
1488	while (blen && srclen--)	1488	while (blen && srclen--)
1489	{	1489	{
1490	if (!hex && /* no binary only */	1490	if (!hex && /* no binary only */
1491	(src != '\\') && / no plain \ */	1491	(src != '\\') && / no plain \ */
1492	(src != '"') && / no " */	1492	(src != '"') && / no " */
1493	isprint((int)src)) / only printables */	1493	isprint((unsigned char)src)) / only printables */
1494	{ /* they are easy... */	1494	{ /* they are easy... */
1495	buffer++ = src++;	1495	buffer++ = src++;
1496	blen--;	1496	blen--;
1497	}	1497	}
1498	else	1498	else
1499	{	1499	{
1500	if (blen < 4)	1500	if (blen < 4)
1501	{	1501	{
1502	while (blen--)	1502	while (blen--)
1503	{	1503	{
1504	*buffer++ = '.';	1504	*buffer++ = '.';
1505	}	1505	}
1506	*buffer = '\0';	1506	*buffer = '\0';