Attachment #213356 for bug #297360

View | Details | Raw Unified | Return to bug 297360
Collapse All | Expand All

Lines 321-327 Link Here

(-)openntpd-3.9p1/client.c (-1 / +1 lines)
321	priv_adjtime();	321	priv_adjtime();
322		322
323	for (i = 0; i < OFFSET_ARRAY_SIZE; i++)	323	for (i = 0; i < OFFSET_ARRAY_SIZE; i++)
324	if (p->reply[i].rcvd <= p->reply[best].rcvd)	324	/* if (p->reply[i].rcvd <= p->reply[best].rcvd) */
325	p->reply[i].good = 0;	325	p->reply[i].good = 0;
326		326
327	return (0);	327	return (0);

Lines 617-622 Link Here

(-)openntpd-3.9p1/configure.ac (+5 lines)
617	fi	617	fi
618	AC_SUBST(mansubdir)	618	AC_SUBST(mansubdir)
619		619
		620	AC_ARG_WITH(adjtimex,
		621	[ --with-adjtimex Use adjtimex to adjust kernel skew],
		622	[ AC_DEFINE(USE_ADJTIMEX, [], [Use adjust skew with adjtimex (experimental)]) ]
		623	)
		624
620	# Search for OpenSSL if required.	625	# Search for OpenSSL if required.
621	if test "$ac_cv_func_arc4random" != "yes" && test "x$builtin_arc4random" != "xyes"; then	626	if test "$ac_cv_func_arc4random" != "yes" && test "x$builtin_arc4random" != "xyes"; then
622	saved_CPPFLAGS="$CPPFLAGS"	627	saved_CPPFLAGS="$CPPFLAGS"

Lines 20-25 Link Here

(-)openntpd-3.9p1/defines.h (+4 lines)
20	# define setproctitle(x)	20	# define setproctitle(x)
21	#endif	21	#endif
22		22
		23	#ifdef USE_ADJTIMEX
		24	# define adjtime(a,b) (_compat_adjtime((a),(b)))
		25	#endif
		26
23	#if !defined(SA_LEN)	27	#if !defined(SA_LEN)
24	# if defined(HAVE_STRUCT_SOCKADDR_SA_LEN)	28	# if defined(HAVE_STRUCT_SOCKADDR_SA_LEN)
25	# define SA_LEN(x) ((x)->sa_len)	29	# define SA_LEN(x) ((x)->sa_len)

Lines 134-139 main(int argc, char *argv[]) Link Here

(-)openntpd-3.9p1/ntpd.c (+2 lines)
134	seed_rng();	134	seed_rng();
135	#endif	135	#endif
136		136
		137	nice(-10);
		138
137	if (!conf.settime) {	139	if (!conf.settime) {
138	log_init(conf.debug);	140	log_init(conf.debug);
139	if (!conf.debug)	141	if (!conf.debug)

Lines 9-15 Link Here

(-)openntpd-3.9p1/openbsd-compat/Makefile.in (-1 / +1 lines)
9	COMPAT= atomicio.o bsd-arc4random.o bsd-misc.o bsd-poll.o \	9	COMPAT= atomicio.o bsd-arc4random.o bsd-misc.o bsd-poll.o \
10	bsd-snprintf.o bsd-getifaddrs.o bsd-setresuid.o \	10	bsd-snprintf.o bsd-getifaddrs.o bsd-setresuid.o \
11	bsd-setresgid.o fake-rfc2553.o	11	bsd-setresgid.o fake-rfc2553.o
12	PORT= port-qnx.o	12	PORT= port-linux.o port-qnx.o
13		13
14	VPATH=@srcdir@	14	VPATH=@srcdir@
15	CC=@CC@	15	CC=@CC@

Lines 46-51 Link Here

(-)openntpd-3.9p1/openbsd-compat/openbsd-compat.h (+5 lines)
46	__attribute__((__format__ (printf, 2, 3)));	46	__attribute__((__format__ (printf, 2, 3)));
47	#endif	47	#endif
48		48
		49	#ifdef USE_ADJTIMEX
		50	# include <sys/time.h>
		51	int _compat_adjtime(const struct timeval , struct timeval );
		52	#endif
		53
49	#ifndef HAVE_INET_PTON	54	#ifndef HAVE_INET_PTON
50	int inet_pton(int, const char , void );	55	int inet_pton(int, const char , void );
51	#endif	56	#endif




/* $Id$ */

/*
 * Copyright (c) 2004 Darren Tucker <dtucker at zip com au>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
 * copyright notice and this permission notice appear in all copies.
 *
 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

#include "includes.h"

#ifdef USE_ADJTIMEX
#include <sys/timex.h>
#include <errno.h>
#ifdef adjtime
# undef adjtime
#endif

/* scale factor used by adjtimex freq param.  1 ppm = 65536 */
#define ADJTIMEX_FREQ_SCALE 65536

/* maximum change to skew per adjustment, in PPM */
#define MAX_SKEW_DELTA 5.0

/*
 * Prevent warnings.  We can't just include ntpd.h because of conflicting
 * definitions of ntp_adjtime()
 */
void log_warn(const char *, ...);
void log_info(const char *, ...);
void log_debug(const char *, ...);

int
_compat_adjtime(const struct timeval *delta, struct timeval *olddelta)
{
	static struct timeval tlast = {0,0};
	static double tskew = 0;
	static int synced = -1;
	struct timeval tnow, tdelta;
	double skew = 0, newskew, deltaskew, adjust, interval = 0;
	struct timex tmx;
	int result, saved_errno;

	gettimeofday(&tnow, NULL);
	adjust = (double)delta->tv_sec;
	adjust += (double)delta->tv_usec / 1000000;

	/* Even if the caller doesn't care about the olddelta, we do */
	if (olddelta == NULL)
		olddelta = &tdelta;

	result = adjtime(delta, olddelta);
	saved_errno = errno;

	if (olddelta->tv_sec == 0 && olddelta->tv_usec == 0 &&
	    synced != INT_MAX)
		synced++;
	 else
		synced = 0;

	/*
	 * do skew calculations if we have synced
	 */
	if (synced == 0 ) {
		tmx.modes = 0;
		if (adjtimex(&tmx) == -1)
			log_warn("adjtimex get failed");
		else
			tskew = (double)tmx.freq / ADJTIMEX_FREQ_SCALE;
	} else if (synced >= 1) {
		interval = (double)(tnow.tv_sec - tlast.tv_sec);
		interval += (double)(tnow.tv_usec - tlast.tv_usec) / 1000000;

		skew = (adjust * 1000000) / interval;
		newskew = ((tskew * synced) + skew) / synced;
		deltaskew = newskew - tskew;

		if (deltaskew > MAX_SKEW_DELTA) {
			log_info("skew change %0.3lf exceeds limit", deltaskew);
			tskew += MAX_SKEW_DELTA;
		} else if (deltaskew < -MAX_SKEW_DELTA) {
			log_info("skew change %0.3lf exceeds limit", deltaskew);
			tskew -= MAX_SKEW_DELTA;
		} else {
			tskew = newskew;
		}

		/* Adjust the kernel skew.  */
		tmx.freq = (long)(tskew * ADJTIMEX_FREQ_SCALE);
		tmx.modes = ADJ_FREQUENCY;
		if (adjtimex(&tmx) == -1)
			log_warn("adjtimex set freq failed");
	}

	log_debug("interval %0.3lf skew %0.3lf total skew %0.3lf", interval,
	    skew, tskew);

	tlast = tnow;
	errno = saved_errno;
	return result;
}
#endif

Return to bug 297360

Line 0 Link Here

(-)openntpd-3.9p1/openbsd-compat/port-linux.c (+111 lines)
		1	/* $Id$ */
		2
		3	/*
		4	* Copyright (c) 2004 Darren Tucker <dtucker at zip com au>
		5	*
		6	* Permission to use, copy, modify, and distribute this software for any
		7	* purpose with or without fee is hereby granted, provided that the above
		8	* copyright notice and this permission notice appear in all copies.
		9	*
		10	* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
		11	* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
		12	* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
		13	* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
		14	* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
		15	* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
		16	* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
		17	*/
		18
		19	#include "includes.h"
		20
		21	#ifdef USE_ADJTIMEX
		22	#include <sys/timex.h>
		23	#include <errno.h>
		24	#ifdef adjtime
		25	# undef adjtime
		26	#endif
		27
		28	/* scale factor used by adjtimex freq param. 1 ppm = 65536 */
		29	#define ADJTIMEX_FREQ_SCALE 65536
		30
		31	/* maximum change to skew per adjustment, in PPM */
		32	#define MAX_SKEW_DELTA 5.0
		33
		34	/*
		35	* Prevent warnings. We can't just include ntpd.h because of conflicting
		36	* definitions of ntp_adjtime()
		37	*/
		38	void log_warn(const char *, ...);
		39	void log_info(const char *, ...);
		40	void log_debug(const char *, ...);
		41
		42	int
		43	_compat_adjtime(const struct timeval delta, struct timeval olddelta)
		44	{
		45	static struct timeval tlast = {0,0};
		46	static double tskew = 0;
		47	static int synced = -1;
		48	struct timeval tnow, tdelta;
		49	double skew = 0, newskew, deltaskew, adjust, interval = 0;
		50	struct timex tmx;
		51	int result, saved_errno;
		52
		53	gettimeofday(&tnow, NULL);
		54	adjust = (double)delta->tv_sec;
		55	adjust += (double)delta->tv_usec / 1000000;
		56
		57	/* Even if the caller doesn't care about the olddelta, we do */
		58	if (olddelta == NULL)
		59	olddelta = &tdelta;
		60
		61	result = adjtime(delta, olddelta);
		62	saved_errno = errno;
		63
		64	if (olddelta->tv_sec == 0 && olddelta->tv_usec == 0 &&
65	synced != INT_MAX)
66	synced++;
67	else
68	synced = 0;
69
70	/*
71	* do skew calculations if we have synced
72	*/
73	if (synced == 0 ) {
74	tmx.modes = 0;
75	if (adjtimex(&tmx) == -1)
76	log_warn("adjtimex get failed");
77	else
78	tskew = (double)tmx.freq / ADJTIMEX_FREQ_SCALE;
79	} else if (synced >= 1) {
80	interval = (double)(tnow.tv_sec - tlast.tv_sec);
81	interval += (double)(tnow.tv_usec - tlast.tv_usec) / 1000000;
82
83	skew = (adjust * 1000000) / interval;
84	newskew = ((tskew * synced) + skew) / synced;
85	deltaskew = newskew - tskew;
86
87	if (deltaskew > MAX_SKEW_DELTA) {
88	log_info("skew change %0.3lf exceeds limit", deltaskew);
89	tskew += MAX_SKEW_DELTA;
90	} else if (deltaskew < -MAX_SKEW_DELTA) {
91	log_info("skew change %0.3lf exceeds limit", deltaskew);
92	tskew -= MAX_SKEW_DELTA;
93	} else {
94	tskew = newskew;
95	}
96
97	/* Adjust the kernel skew. */
98	tmx.freq = (long)(tskew * ADJTIMEX_FREQ_SCALE);
99	tmx.modes = ADJ_FREQUENCY;
100	if (adjtimex(&tmx) == -1)
101	log_warn("adjtimex set freq failed");
102	}
103
104	log_debug("interval %0.3lf skew %0.3lf total skew %0.3lf", interval,
105	skew, tskew);
106
107	tlast = tnow;
108	errno = saved_errno;
109	return result;
110	}
111	#endif