From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 5 Jan 2000 05:07:00 +0000 (-0000)
Subject: ChangeLog, ntp_io.c, refclock_fg.c, refclock_wwv.c:
X-Git-Tag: NTP_4_0_98_J~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0e5eed44c21f8b323eedc5cbf578015d3af8c8d;p=thirdparty%2Fntp.git

ChangeLog, ntp_io.c, refclock_fg.c, refclock_wwv.c:
  * ntpd/ntp_io.c (open_socket): TOS support
  * ntpd/refclock_wwv.c: Declaration cleanup
  * ntpd/refclock_fg.c (fg_receive): Not all sprintf's are created equal...
  From: Marc.Brett@westgeo.com

bk: 3872d174D89ymdBCispLbQU_gGWQVw
---

diff --git a/ChangeLog b/ChangeLog
index 52bcc72ee..e9a1d5b64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
+2000-01-05  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+	* ntpd/ntp_io.c (open_socket): TOS support
+	From: Marc.Brett@westgeo.com
+
 2000-01-04  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+	* ntpd/refclock_wwv.c: Declaration cleanup
+	* ntpd/refclock_fg.c (fg_receive): Not all sprintf's are created
+	equal...
+	From: Marc.Brett@westgeo.com
+
 	* ntpd/refclock_wwv.c: Dave Cleaned and Improved things.
 	* ntpd/ntp_loopfilter.c (local_clock): Dave fixed something.
 
diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 7ab31e4ca..62ca80ab1 100644
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -19,6 +19,10 @@
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif
+#ifdef HAVE_NETINET_IP_H
+# include <netinet/in_systm.h>
+# include <netinet/ip.h>
+#endif
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif
@@ -880,7 +884,7 @@ open_socket(
 	int turn_off_reuse
 	)
 {
-	int fd;
+	int fd, tos;
 	int on = 1, off = 0;
 
 	/* create a datagram (UDP) socket */
@@ -905,6 +909,15 @@ open_socket(
 		msyslog(LOG_ERR, "setsockopt SO_REUSEADDR on fails: %m");
 	}
 
+#if defined(IPTOS_LOWDELAY) && defined(IPPROTO_IP) && defined(IP_TOS)
+	/* set IP_TOS to minimize packet delay */
+	tos = IPTOS_LOWDELAY;
+	if (setsockopt(fd, IPPROTO_IP, IP_TOS, (char *) &tos, sizeof(tos)) < 0)
+	{
+		msyslog(LOG_ERR, "setsockopt IPTOS_LOWDELAY on fails: %m");
+	}
+#endif /* IPTOS_LOWDELAY && IPPROTO_IP && IP_TOS */
+
 	/*
 	 * bind the local address.
 	 */
diff --git a/ntpd/refclock_fg.c b/ntpd/refclock_fg.c
index ce726a36e..de169002b 100644
--- a/ntpd/refclock_fg.c
+++ b/ntpd/refclock_fg.c
@@ -241,7 +241,8 @@ fg_receive(
         pp->minute = BP1(6)*10 + BP2(6);
         pp->second = BP1(7)*10 + BP2(7);
         pp->usec = BP1(8)*100 + BP2(8)*10 + BP1(9);
-        pp->lencode = sprintf(pp->a_lastcode, "%d %d %d %d %d", pp->year, pp->day, pp->hour, pp->minute, pp->second);
+	sprintf(pp->a_lastcode, "%d %d %d %d %d", pp->year, pp->day, pp->hour, pp->minute, pp->second);
+	pp->lencode = strlen(pp->a_lastcode);
         get_systime(&pp->lastrec);
 
 #ifdef DEBUG
diff --git a/ntpd/refclock_wwv.c b/ntpd/refclock_wwv.c
index 4df19e89c..15679d41a 100644
--- a/ntpd/refclock_wwv.c
+++ b/ntpd/refclock_wwv.c
@@ -598,7 +598,7 @@ static	double	wwv_rsec	P((struct peer *, double));
 static	void	wwv_qrz		P((struct peer *, struct sync *,
 				    double));
 static	void	wwv_corr4	P((struct peer *, struct decvec *,
-				    double [], double [][]));
+				    double *, double **));
 static	void	wwv_gain	P((struct peer *));
 static	void	wwv_tsec	P((struct wwvunit *));
 static	double	wwv_data	P((struct wwvunit *, double));