[ntp:bk-ntp-dev-send] BitKeeper patch

Harlan Stenn stenn at mail.eecis.udel.edu
Fri Nov 4 23:49:27 PST 2005


This BitKeeper patch contains the following changesets:
mayer at pogo.udel.edu|ChangeSet|20051016224340|06922
mayer at pogo.udel.edu|ChangeSet|20051023034331|06915
mayer at pogo.udel.edu|ChangeSet|20051104044006|21182
mayer at pogo.udel.edu|ChangeSet|20051102044029|06856
mayer at pogo.udel.edu|ChangeSet|20051004162254|06940

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# ID:	stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
# User:	stenn
# Host:	deacon.udel.edu
# Root:	/deacon/backroom/ntp-dev

#
#--- 1.27/include/ntp_rfc2553.h	2004-11-30 05:18:39 -05:00
#+++ 1.28/include/ntp_rfc2553.h	2005-11-01 23:40:06 -05:00
#@@ -79,6 +79,12 @@
# #include "ntp_types.h"
# 
# /*
#+ * Don't include any additional IPv6 definitions
#+ * We are defining our own here.
#+ */
#+#define ISC_IPV6_H 1
#+
#+ /*
#  * If various macros are not defined we need to define them
#  */
# 
#@@ -141,6 +147,19 @@
# #endif
# 
# #ifndef ISC_PLATFORM_HAVEIPV6
#+/*
#+ * Definition of some useful macros to handle IP6 addresses
#+ */
#+#ifdef ISC_PLATFORM_NEEDIN6ADDRANY
#+#ifdef SYS_WINNT
#+#define IN6ADDR_ANY_INIT 	{{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }}
#+#else
#+#define IN6ADDR_ANY_INIT \
#+	{{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
#+	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}
#+#endif
#+#endif
#+
# 
# /*
#  * IPv6 address
#@@ -148,11 +167,6 @@
# #ifdef SYS_WINNT
# #define in6_addr in_addr6
# #else
#-/*
#- * Don't include any additional IPv6 definitions
#- * We are defining our own here.
#- */
#-#define ISC_IPV6_H 1
# 
# struct in6_addr {
# 	union {
#@@ -165,18 +179,9 @@
# #define s6_addr   __u6_addr.__u6_addr8
# #endif
# 
#-/*
#- * Definition of some useful macros to handle IP6 addresses
#- */
#-#ifdef SYS_WINNT
#-#define IN6ADDR_ANY_INIT 	{{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }}
#-#else
#-#define IN6ADDR_ANY_INIT \
#-	{{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
#-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}
#-#endif
#-
#+#if defined(ISC_PLATFORM_HAVEIPV6) && defined(ISC_PLATFORM_NEEDIN6ADDRANY)
# extern const struct in6_addr in6addr_any;
#+#endif
# 
# #define SIN6_LEN
# #ifndef HAVE_SOCKADDR_IN6
#
#--- 1.26/libntp/ntp_rfc2553.c	2005-10-01 01:00:52 -04:00
#+++ 1.27/libntp/ntp_rfc2553.c	2005-11-01 23:40:06 -05:00
#@@ -313,7 +313,13 @@
# 		{
# 			sockin6 = (struct sockaddr_in6 *)ai->ai_addr;
# 			sockin6->sin6_family = (short) ai->ai_family;
#-			sockin6->sin6_addr = in6addr_any;
#+			/*
#+			 * we have already zeroed out the address
#+			 * so we don't actually need to do this
#+			 * This assignment is causing problems so
#+			 * we don't do what this would do.
#+			 sockin6->sin6_addr = in6addr_any;
#+			 */
# 		}
# #ifdef HAVE_SA_LEN_IN_STRUCT_SOCKADDR
# 		ai->ai_addr->sa_len = SOCKLEN(ai->ai_addr);
#
#--- 1.6/include/isc/ipv6.h	2004-12-24 18:15:54 -05:00
#+++ 1.7/include/isc/ipv6.h	2005-11-01 23:40:06 -05:00
#@@ -76,8 +76,8 @@
# #define s6_addr16	_S6_un._S6_u16
# #define s6_addr32	_S6_un._S6_u32
# 
#-#define IN6ADDR_ANY_INIT 	{{{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }}}
#-#define IN6ADDR_LOOPBACK_INIT 	{{{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 }}}
#+#define IN6ADDR_ANY_INIT 	{{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }}
#+#define IN6ADDR_LOOPBACK_INIT 	{{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 }}
# 
# LIBISC_EXTERNAL_DATA extern const struct in6_addr in6addr_any;
# LIBISC_EXTERNAL_DATA extern const struct in6_addr in6addr_loopback;
#
#--- 1.7/include/isc/net.h	2005-10-01 01:00:52 -04:00
#+++ 1.8/include/isc/net.h	2005-11-01 23:40:06 -05:00
#@@ -180,12 +180,12 @@
# /*
#  * Cope with a missing in6addr_any and in6addr_loopback.
#  */
#-#if defined(ISC_PLATFORM_NEEDIN6ADDRANY)
#+#if defined(ISC_PLATFORM_HAVEIPV6) && defined(ISC_PLATFORM_NEEDIN6ADDRANY)
# extern const struct in6_addr isc_net_in6addrany;
# #define in6addr_any isc_net_in6addrany
# #endif
# 
#-#if defined(ISC_PLATFORM_NEEDIN6ADDRLOOPBACK)
#+#if defined(ISC_PLATFORM_HAVEIPV6) && defined(ISC_PLATFORM_NEEDIN6ADDRLOOPBACK)
# extern const struct in6_addr isc_net_in6addrloop;
# #define in6addr_loopback isc_net_in6addrloop
# #endif
#
#--- 1.6/libisc/net.c	2005-10-01 01:00:52 -04:00
#+++ 1.7/libisc/net.c	2005-11-01 23:40:06 -05:00
#@@ -30,7 +30,6 @@
# 
# #if defined(ISC_PLATFORM_HAVEIPV6) && defined(ISC_PLATFORM_NEEDIN6ADDRANY)
# const struct in6_addr isc_net_in6addrany = IN6ADDR_ANY_INIT;
#-#define in6addr_any isc_net_in6addrany
# #endif
# 
# #if defined(ISC_PLATFORM_HAVEIPV6) && defined(ISC_PLATFORM_NEEDIN6ADDRLOOPBACK)
#
#--- 1.4/libisc/sockaddr.c	2005-05-26 05:18:57 -04:00
#+++ 1.5/libisc/sockaddr.c	2005-11-01 23:40:06 -05:00
#@@ -261,10 +261,10 @@
# 	ISC_LINK_INIT(sockaddr, link);
# }
# 
#-#ifdef ISC_PLATFORM_HAVEIPV6
# void
# isc_sockaddr_any6(isc_sockaddr_t *sockaddr)
# {
#+#ifdef ISC_PLATFORM_HAVEIPV6
# 	memset(sockaddr, 0, sizeof(*sockaddr));
# 	sockaddr->type.sin6.sin6_family = AF_INET6;
# #ifdef ISC_PLATFORM_HAVESALEN
#@@ -274,8 +274,8 @@
# 	sockaddr->type.sin6.sin6_port = 0;
# 	sockaddr->length = sizeof(sockaddr->type.sin6);
# 	ISC_LINK_INIT(sockaddr, link);
#-}
# #endif
#+}
# 
# void
# isc_sockaddr_fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina,
#
#--- 1.20/include/ntp_machine.h	2005-08-02 23:04:38 -04:00
#+++ 1.21/include/ntp_machine.h	2005-11-01 23:40:06 -05:00
#@@ -239,6 +239,7 @@
# #ifndef SYS_WINNT
# # define SOCKET	int
# # define INVALID_SOCKET	-1
#+# define SOCKET_ERROR	-1
# # define closesocket close
# #endif
# /*
#
#--- 1.40/ntpd/ntp_intres.c	2005-05-24 03:36:39 -04:00
#+++ 1.42/ntpd/ntp_intres.c	2005-11-03 23:39:56 -05:00
#@@ -169,6 +169,21 @@
# };
# 
# 
#+static void	resolver_exit P((int));
#+
#+/*
#+ * Call here instead of just exiting
#+ */
#+
#+static void resolver_exit (int code)
#+{
#+#ifdef SYS_WINNT
#+	ExitThread (code);	/* Just to kill the thread not the process */
#+#else
#+	exit (code);		/* fill the forked process */
#+#endif
#+}
#+
# /*
#  * ntp_res_recv: Process an answer from the resolver
#  */
#@@ -212,7 +227,7 @@
# 		if (!authistrusted(req_keyid)) {
# 			msyslog(LOG_ERR, "invalid request keyid %08x",
# 			    req_keyid );
#-			exit(1);
#+			resolver_exit(1);
# 		}
# 	}
# 
#@@ -224,7 +239,7 @@
# 	if ((in = fopen(req_file, "r")) == NULL) {
# 		msyslog(LOG_ERR, "can't open configuration file %s: %m",
# 			req_file);
#-		exit(1);
#+		resolver_exit(1);
# 	}
# 	readconf(in, req_file);
# 	(void) fclose(in);
#@@ -243,11 +258,7 @@
# 	 */
# 	doconfigure(1);
# 	if (confentries == NULL) {
#-#if defined SYS_WINNT
#-		ExitThread(0);	/* Don't want to kill whole NT process */
#-#else
#-		exit(0);	/* done that quick */
#-#endif
#+		resolver_exit(0);
# 	}
# 	
# 	/*
#@@ -263,7 +274,7 @@
# 
# 	for (;;) {
# 		if (confentries == NULL)
#-		    exit(0);
#+		    resolver_exit(0);
# 
# 		checkparent();
# 
#@@ -285,7 +296,7 @@
# 				msyslog(LOG_INFO, "config_timer: 0->%d", config_timer);
# #endif
# 			doconfigure(0);
#-			continue;
#+			continue; 
# 		}
# #ifndef SYS_WINNT
# 		/*
#@@ -346,7 +357,7 @@
# 	 */
# 	if (getppid() == 1) {
# 		msyslog(LOG_INFO, "parent died before we finished, exiting");
#-		exit(0);
#+		resolver_exit(0);
# 	}
# #endif /* SYS_WINNT && SYS_VXWORKS*/
# }
#@@ -459,13 +470,13 @@
# 
# 	checkparent();		/* make sure our guy is still running */
# 
#-	if (entry->ce_name != NULL && SOCKNUL(&entry->peer_store)) {
#+	if (entry->ce_name != NULL && !SOCKNUL(&entry->peer_store)) {
# 		/* HMS: Squawk? */
# 		msyslog(LOG_ERR, "findhostaddr: both ce_name and ce_peeraddr are defined...");
# 		return 1;
# 	}
# 
#-        if (entry->ce_name == NULL && !SOCKNUL(&entry->peer_store)) {
#+        if (entry->ce_name == NULL && SOCKNUL(&entry->peer_store)) {
# 		msyslog(LOG_ERR, "findhostaddr: both ce_name and ce_peeraddr are undefined!");
# 		return 0;
# 	}
#@@ -482,7 +493,7 @@
# 		/*
# 		 * If the IPv6 stack is not available look only for IPv4 addresses
# 		 */
#-		if (isc_net_probeipv6() == ISC_R_SUCCESS)
#+		if (isc_net_probeipv6() != ISC_R_SUCCESS)
# 			hints.ai_family = AF_INET;
# 
# 		error = getaddrinfo(entry->ce_name, NULL, &hints, &addr);
#@@ -516,7 +527,7 @@
# 		 * If the resolver is in use, see if the failure is
# 		 * temporary.  If so, return success.
# 		 */
#-		if (h_errno == TRY_AGAIN)
#+		if (error == EAI_AGAIN)
# 		    return (1);
# 		return (0);
# 	}
#@@ -545,29 +556,28 @@
# {
# 	struct addrinfo hints;
# 	struct addrinfo *addrResult;
#+	const char *localhost = "127.0.0.1";	/* Use IPv6 loopback */
# 
# 	if (sockfd >= 0)
# 	    return;
# 
# 	memset(&hints, 0, sizeof(hints));
#-	hints.ai_family = AF_UNSPEC;
# 
# 	/*
#-	 * If the IPv6 stack is not available look only for IPv4 addresses
#+	 * For now only bother with IPv4
# 	 */
#-	if (isc_net_probeipv6() == ISC_R_SUCCESS)
#-		hints.ai_family = AF_INET;
#+	hints.ai_family = AF_INET;
# 
# 	hints.ai_socktype = SOCK_DGRAM;
#-	if (getaddrinfo(NULL, "ntp", &hints, &addrResult)!=0) {
#+	if (getaddrinfo(localhost, "ntp", &hints, &addrResult)!=0) {
# 		msyslog(LOG_ERR, "getaddrinfo failed: %m");
#-		exit(1);
#+		resolver_exit(1);
# 	}
# 	sockfd = socket(addrResult->ai_family, addrResult->ai_socktype, 0);
# 
# 	if (sockfd == -1) {
# 		msyslog(LOG_ERR, "socket() failed: %m");
#-		exit(1);
#+		resolver_exit(1);
# 	}
# 
# 	/*
#@@ -577,13 +587,13 @@
# #if defined(O_NONBLOCK)
# 	if (fcntl(sockfd, F_SETFL, O_NONBLOCK) == -1) {
# 		msyslog(LOG_ERR, "fcntl(O_NONBLOCK) failed: %m");
#-		exit(1);
#+		resolver_exit(1);
# 	}
# #else
# #if defined(FNDELAY)
# 	if (fcntl(sockfd, F_SETFL, FNDELAY) == -1) {
# 		msyslog(LOG_ERR, "fcntl(FNDELAY) failed: %m");
#-		exit(1);
#+		resolver_exit(1);
# 	}
# #else
# # include "Bletch: NEED NON BLOCKING IO"
#@@ -594,13 +604,13 @@
# 		int on = 1;
# 		if (ioctlsocket(sockfd,FIONBIO,(u_long *) &on) == SOCKET_ERROR) {
# 			msyslog(LOG_ERR, "ioctlsocket(FIONBIO) fails: %m");
#-			exit(1); /* Windows NT - set socket in non-blocking mode */
#+			resolver_exit(1); /* Windows NT - set socket in non-blocking mode */
# 		}
# 	}
# #endif /* SYS_WINNT */
# 	if (connect(sockfd, addrResult->ai_addr, addrResult->ai_addrlen) == -1) {
# 		msyslog(LOG_ERR, "openntp: connect() failed: %m");
#-		exit(1);
#+		resolver_exit(1);
# 	}
# 	freeaddrinfo(addrResult);
# }
#@@ -628,7 +638,7 @@
# 
# 	checkparent();		/* make sure our guy is still running */
# 
#-	if (sockfd < 0)
#+	if (sockfd == INVALID_SOCKET)
# 	    openntp();
# 	
# #ifdef SYS_WINNT
#@@ -664,7 +674,7 @@
# 	/* Make sure mbz_itemsize <= sizeof reqpkt.data */
# 	if (sizeof(struct conf_peer) > sizeof (reqpkt.data)) {
# 		msyslog(LOG_ERR, "Bletch: conf_peer is too big for reqpkt.data!");
#-		exit(1);
#+		resolver_exit(1);
# 	}
# 	memmove(reqpkt.data, (char *)conf, sizeof(struct conf_peer));
# 	reqpkt.keyid = htonl(req_keyid);
#@@ -972,7 +982,7 @@
# 				msyslog(LOG_ERR,
# 					"tokenizing error in file `%s', quitting",
# 					name);
#-				exit(1);
#+				resolver_exit(1);
# 			}
# 		}
# 
#@@ -981,7 +991,7 @@
# 				msyslog(LOG_ERR,
# 					"format error for integer token `%s', file `%s', quitting",
# 					token[i], name);
#-				exit(1);
#+				resolver_exit(1);
# 			}
# 		}
# 
#@@ -990,27 +1000,27 @@
# 		    intval[TOK_HMODE] != MODE_BROADCAST) {
# 			msyslog(LOG_ERR, "invalid mode (%ld) in file %s",
# 				intval[TOK_HMODE], name);
#-			exit(1);
#+			resolver_exit(1);
# 		}
# 
# 		if (intval[TOK_VERSION] > NTP_VERSION ||
# 		    intval[TOK_VERSION] < NTP_OLDVERSION) {
# 			msyslog(LOG_ERR, "invalid version (%ld) in file %s",
# 				intval[TOK_VERSION], name);
#-			exit(1);
#+			resolver_exit(1);
# 		}
# 		if (intval[TOK_MINPOLL] < NTP_MINPOLL ||
# 		    intval[TOK_MINPOLL] > NTP_MAXPOLL) {
# 			msyslog(LOG_ERR, "invalid MINPOLL value (%ld) in file %s",
# 				intval[TOK_MINPOLL], name);
#-			exit(1);
#+			resolver_exit(1);
# 		}
# 
# 		if (intval[TOK_MAXPOLL] < NTP_MINPOLL ||
# 		    intval[TOK_MAXPOLL] > NTP_MAXPOLL) {
# 			msyslog(LOG_ERR, "invalid MAXPOLL value (%ld) in file %s",
# 				intval[TOK_MAXPOLL], name);
#-			exit(1);
#+			resolver_exit(1);
# 		}
# 
# 		if ((intval[TOK_FLAGS] & ~(FLAG_AUTHENABLE | FLAG_PREFER |
#@@ -1018,7 +1028,7 @@
# 		    != 0) {
# 			msyslog(LOG_ERR, "invalid flags (%ld) in file %s",
# 				intval[TOK_FLAGS], name);
#-			exit(1);
#+			resolver_exit(1);
# 		}
# 
# 		flags = 0;
#@@ -1065,7 +1075,7 @@
# 			    "doconfigure: <%s> has peeraddr %s",
# 			    ce->ce_name, stoa(&ce->peer_store));
# #endif
#-		if (dores && !SOCKNUL(&(ce->peer_store))) {
#+		if (dores && SOCKNUL(&(ce->peer_store))) {
# 			if (!findhostaddr(ce)) {
# 				msyslog(LOG_ERR,
# 					"couldn't resolve `%s', giving up on it",
#
#--- 1.52/ntpdate/ntpdate.c	2005-09-24 23:17:53 -04:00
#+++ 1.53/ntpdate/ntpdate.c	2005-11-01 23:40:06 -05:00
#@@ -21,6 +21,12 @@
# #include "ntp_select.h"
# #include "ntp_stdlib.h"
# 
#+/* Don't include ISC's version of IPv6 variables and structures */
#+#define ISC_IPV6_H 1
#+#include "isc/net.h"
#+#include "isc/result.h"
#+#include "isc/sockaddr.h"
#+
# #ifdef HAVE_UNISTD_H
# # include <unistd.h>
# #endif
#@@ -47,6 +53,10 @@
# 
# #include <arpa/inet.h>
# 
#+#ifdef __QNXNTO__
#+# include "adjtime.h"
#+#endif
#+
# #ifdef SYS_VXWORKS
# # include "ioLib.h"
# # include "sockLib.h"
#@@ -351,6 +361,12 @@
# 	clear_globals();
# #endif
# 
#+
#+	/* Check to see if we have IPv6. Otherwise force the -4 flag */
#+	if (isc_net_probeipv6() != ISC_R_SUCCESS) {
#+		ai_fam_templ = AF_INET;
#+	}
#+
# 	errflg = 0;
# 	progname = argv[0];
# 	syslogit = 0;
#@@ -605,13 +621,13 @@
# #endif
# 			if (nfound > 0)
# 				input_handler();
#-#ifndef SYS_WINNT
#-			else if (nfound == -1)
#-#else
# 			else if (nfound == SOCKET_ERROR)
#-#endif /* SYS_WINNT */
# 			{
#+#ifndef SYS_WINNT
# 				if (errno != EINTR)
#+#else
#+				if (WSAGetLastError() != WSAEINTR)
#+#endif
# 					netsyslog(LOG_ERR,
# #ifdef HAVE_POLL_H
# 						"poll() error: %m"
#@@ -1419,6 +1435,16 @@
# {
# 	struct server *server;
# 	struct server *mc_server;
#+	isc_sockaddr_t laddr;
#+	isc_sockaddr_t saddr;
#+
#+	if(addr->ss_family == AF_INET) {
#+		isc_sockaddr_fromin( &laddr, &((struct sockaddr_in*)&addr)->sin_addr, 0);
#+	}
#+	else {
#+		isc_sockaddr_fromin6(&laddr, &((struct sockaddr_in6*)&addr)->sin6_addr, 0);
#+	}
#+
# 
# 	mc_server = NULL;
# 	if (htons(((struct sockaddr_in*)addr)->sin_port) != NTP_PORT)
#@@ -1427,20 +1453,18 @@
# 	for (server = sys_servers; server != NULL; 
# 	     server = server->next_server) {
# 		
#-		if (memcmp(addr, &server->srcadr, SOCKLEN(addr))==0)
#-			return server;
#-		/* Multicast compatibility to verify here... I'm not sure it's working */
#-		if(addr->ss_family == AF_INET) {
#-			if (IN_MULTICAST(ntohl(((struct sockaddr_in*)addr)->sin_addr.s_addr)))
#-				mc_server = server;
#+		if(server->srcadr.ss_family == AF_INET) {
#+			isc_sockaddr_fromin(&saddr, &((struct sockaddr_in*)&server->srcadr)->sin_addr, 0);
# 		}
# 		else {
#-#ifdef AF_INET6
#-			if (IN6_IS_ADDR_MULTICAST(&((struct sockaddr_in6*)(&server->srcadr))->sin6_addr))
#-			mc_server = server;
#-#else
#-			return 0;
#-#endif
#+			isc_sockaddr_fromin6(&saddr, &((struct sockaddr_in6*)&server->srcadr)->sin6_addr, 0);
#+		}
#+		if (isc_sockaddr_eqaddr(&laddr, &saddr) == ISC_TRUE)
#+			return server;
#+
#+		if(addr->ss_family == server->srcadr.ss_family) {
#+			if (isc_sockaddr_ismulticast(&saddr) == ISC_TRUE)
#+				mc_server = server;
# 		}
# 	}
# 
#@@ -1856,11 +1880,10 @@
# 	cc = sendto(sock, (char *)pkt, len, 0, (struct sockaddr *)dest,
# 			SOCKLEN(dest));
# 
#+	if (cc == SOCKET_ERROR) {
# #ifndef SYS_WINNT
#-	if (cc == -1) {
# 		if (errno != EWOULDBLOCK && errno != ENOBUFS)
# #else
#-	if (cc == SOCKET_ERROR) {
# 		err = WSAGetLastError();
# 		if (err != WSAEWOULDBLOCK && err != WSAENOBUFS)
# #endif /* SYS_WINNT */
#

# Diff checksum=33a07102


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
mayer at pogo.udel.edu|ChangeSet|20051003205831|07127
D 1.1404.3.1 05/10/04 12:22:54-04:00 mayer at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fix extra y at beginning of file
K 6940
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntp_proto.c|19990526004817|01635|3aed0663 mayer at pogo.udel.edu|ntpd/ntp_proto.c|20051004162223|60229

mayer at pogo.udel.edu|ChangeSet|20051004162254|06940
D 1.1404.3.2 05/10/16 18:43:40-04:00 mayer at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fixes from bug #411 Marc de la Gueronniere
K 6922
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntp_intres.c|19990526004817|01635|3aed0663 mayer at pogo.udel.edu|ntpd/ntp_intres.c|20051016224309|56960

mayer at pogo.udel.edu|ChangeSet|20051016224340|06922
D 1.1404.3.3 05/10/22 23:43:31-04:00 mayer at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #411 fix from Marc
K 6915
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntp_intres.c|19990526004817|01635|3aed0663 mayer at pogo.udel.edu|ntpd/ntp_intres.c|20051023034302|56927

mayer at pogo.udel.edu|ChangeSet|20051023034331|06915
D 1.1404.3.4 05/11/01 23:40:29-05:00 mayer at pogo.udel.edu +8 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug fixes to support IPv6 changes for non-IPv6 capable systems
K 6856
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|include/ntp_machine.h|19990526004814|01635|3aed0663 mayer at pogo.udel.edu|include/ntp_machine.h|20051102044006|26053
> jhay at angel.cids.org.za|include/ntp_rfc2553.h|20011004194249|08764|d8c85aa6dfbf483 mayer at pogo.udel.edu|include/ntp_rfc2553.h|20051102044006|28895
> mayer at tecotoo.myibg.com|include/isc/ipv6.h|20030105020009|30586|ce4106b8 mayer at pogo.udel.edu|include/isc/ipv6.h|20051102044006|03464
> mayer at tecotoo.myibg.com|include/isc/net.h|20030105020024|42568|cf50355d mayer at pogo.udel.edu|include/isc/net.h|20051102044006|41696
> mayer at tecotoo.myibg.com|libisc/net.c|20030105020057|42881|d19cebcf mayer at pogo.udel.edu|libisc/net.c|20051102044006|57618
> mayer at tecotoo.|libisc/sockaddr.c|20041223050001|38826|afd59d6e mayer at pogo.udel.edu|libisc/sockaddr.c|20051102044006|46773
> jhay at angel.cids.org.za|libntp/ntp_rfc2553.c|20011004194249|12627|ba0e411f8e42699a mayer at pogo.udel.edu|libntp/ntp_rfc2553.c|20051102044006|04434
> stenn at whimsy.udel.edu|ntpdate/ntpdate.c|19990526004819|01635|3aed0663 mayer at pogo.udel.edu|ntpdate/ntpdate.c|20051102044006|06922

stenn at deacon.udel.edu|ChangeSet|20051102115406|21609
D 1.1431 05/11/03 23:40:06-05:00 mayer at pogo.udel.edu +2 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Merge bk://www.ntp.org/home/bk/ntp-dev
c into  pogo.udel.edu:/pogo/users/mayer/ntp-dev
i mayer at pogo.udel.edu|ChangeSet|20051004162254|06940
i mayer at pogo.udel.edu|ChangeSet|20051016224340|06922
i mayer at pogo.udel.edu|ChangeSet|20051023034331|06915
i mayer at pogo.udel.edu|ChangeSet|20051102044029|06856
K 21182
M mayer at pogo.udel.edu|ChangeSet|20051102044029|06856
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntp_intres.c|19990526004817|01635|3aed0663 mayer at pogo.udel.edu|ntpd/ntp_intres.c|20051104043956|56927
> stenn at whimsy.udel.edu|ntpd/ntp_proto.c|19990526004817|01635|3aed0663 mayer at pogo.udel.edu|ntpd/ntp_proto.c|20051104043957|29097

== include/ntp_rfc2553.h ==
jhay at angel.cids.org.za|include/ntp_rfc2553.h|20011004194249|08764|d8c85aa6dfbf483
stenn at pogo.udel.edu|include/ntp_rfc2553.h|20041130101839|19445
D 1.28 05/11/01 23:40:06-05:00 mayer at pogo.udel.edu +21 -16
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug fixes to support IPv6 changes for non-IPv6 capable systems
K 28895
O -rw-rw-r--
P include/ntp_rfc2553.h
------------------------------------------------

I81 6
 * Don't include any additional IPv6 definitions
 * We are defining our own here.
 */
#define ISC_IPV6_H 1
\
 /*
I143 13
/*
 * Definition of some useful macros to handle IP6 addresses
 */
#ifdef ISC_PLATFORM_NEEDIN6ADDRANY
#ifdef SYS_WINNT
#define IN6ADDR_ANY_INIT 	{{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }}
#else
#define IN6ADDR_ANY_INIT \
	{{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}
#endif
#endif
\
D151 5
D168 11
I178 1
#if defined(ISC_PLATFORM_HAVEIPV6) && defined(ISC_PLATFORM_NEEDIN6ADDRANY)
I179 1
#endif

== libntp/ntp_rfc2553.c ==
jhay at angel.cids.org.za|libntp/ntp_rfc2553.c|20011004194249|12627|ba0e411f8e42699a
mayer at pogo.udel.edu|libntp/ntp_rfc2553.c|20051001050052|55661
D 1.27 05/11/01 23:40:06-05:00 mayer at pogo.udel.edu +7 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug fixes to support IPv6 changes for non-IPv6 capable systems
K 4434
O -rw-rw-r--
P libntp/ntp_rfc2553.c
------------------------------------------------

D316 1
I316 7
			/*
			 * we have already zeroed out the address
			 * so we don't actually need to do this
			 * This assignment is causing problems so
			 * we don't do what this would do.
			 sockin6->sin6_addr = in6addr_any;
			 */

== include/isc/ipv6.h ==
mayer at tecotoo.myibg.com|include/isc/ipv6.h|20030105020009|30586|ce4106b8
mayer at tecotoo.|include/isc/ipv6.h|20041224231554|03960
D 1.7 05/11/01 23:40:06-05:00 mayer at pogo.udel.edu +2 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug fixes to support IPv6 changes for non-IPv6 capable systems
K 3464
O -rw-rw-r--
P include/isc/ipv6.h
------------------------------------------------

D79 2
I80 2
#define IN6ADDR_ANY_INIT 	{{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }}
#define IN6ADDR_LOOPBACK_INIT 	{{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 }}

== include/isc/net.h ==
mayer at tecotoo.myibg.com|include/isc/net.h|20030105020024|42568|cf50355d
mayer at pogo.udel.edu|include/isc/net.h|20051001050052|36594
D 1.8 05/11/01 23:40:06-05:00 mayer at pogo.udel.edu +2 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug fixes to support IPv6 changes for non-IPv6 capable systems
K 41696
O -rw-rw-r--
P include/isc/net.h
------------------------------------------------

D183 1
I183 1
#if defined(ISC_PLATFORM_HAVEIPV6) && defined(ISC_PLATFORM_NEEDIN6ADDRANY)
D188 1
I188 1
#if defined(ISC_PLATFORM_HAVEIPV6) && defined(ISC_PLATFORM_NEEDIN6ADDRLOOPBACK)

== libisc/net.c ==
mayer at tecotoo.myibg.com|libisc/net.c|20030105020057|42881|d19cebcf
mayer at pogo.udel.edu|libisc/net.c|20051001050052|61293
D 1.7 05/11/01 23:40:06-05:00 mayer at pogo.udel.edu +0 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug fixes to support IPv6 changes for non-IPv6 capable systems
K 57618
O -rw-rw-r--
P libisc/net.c
------------------------------------------------

D33 1

== libisc/sockaddr.c ==
mayer at tecotoo.|libisc/sockaddr.c|20041223050001|38826|afd59d6e
stenn at pogo.udel.edu|libisc/sockaddr.c|20050526091857|46773
D 1.5 05/11/01 23:40:06-05:00 mayer at pogo.udel.edu +2 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug fixes to support IPv6 changes for non-IPv6 capable systems
K 46773
O -rw-rw-rw-
P libisc/sockaddr.c
------------------------------------------------

D264 1
I267 1
#ifdef ISC_PLATFORM_HAVEIPV6
D277 1
I278 1
}

== include/ntp_machine.h ==
stenn at whimsy.udel.edu|include/ntp_machine.h|19990526004814|01635|3aed0663
stenn at whimsy.udel.edu|include/ntp_machine.h|20050803030438|24276
D 1.21 05/11/01 23:40:06-05:00 mayer at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug fixes to support IPv6 changes for non-IPv6 capable systems
K 26053
O -rw-rw-r--
P include/ntp_machine.h
------------------------------------------------

I241 1
# define SOCKET_ERROR	-1

== ntpd/ntp_intres.c ==
stenn at whimsy.udel.edu|ntpd/ntp_intres.c|19990526004817|01635|3aed0663
stenn at pogo.udel.edu|ntpd/ntp_intres.c|20050524073639|28535
D 1.40.1.1 05/10/16 18:43:09-04:00 mayer at pogo.udel.edu +44 -34
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fixes from bug #411 Marc de la Gueronniere
K 56960
O -rw-rw-r--
P ntpd/ntp_intres.c
------------------------------------------------

I171 15
static void	resolver_exit P((int));
\
/*
 * Call here instead of just exiting
 */
\
static void resolver_exit (int code)
{
#ifdef SYS_WINNT
	ExitThread (code);	/* Just to kill the thread not the process */
#else
	exit (code);		/* fill the forked process */
#endif
}
\
D215 1
I215 1
			resolver_exit(1);
D227 1
I227 1
		resolver_exit(1);
D246 5
I250 1
		resolver_exit(0);
D266 1
I266 1
		    resolver_exit(0);
D288 1
I288 1
			continue; 
D349 1
I349 1
		resolver_exit(0);
D462 1
I462 1
	if (entry->ce_name != NULL && !SOCKNUL(&entry->peer_store)) {
D468 1
I468 1
        if (entry->ce_name == NULL && SOCKNUL(&entry->peer_store)) {
D485 1
I485 1
		if (isc_net_probeipv6() != ISC_R_SUCCESS)
D519 1
I519 1
		if (error == EAI_AGAIN)
I547 1
	const char *localhost = "127.0.0.1";	/* Use IPv6 loopback */
D553 1
D556 1
I556 1
	 * For now only bother with IPv4
D558 2
I559 1
	hints.ai_family = AF_INET;
D562 1
I562 1
	if (getaddrinfo(localhost, "ntp", &hints, &addrResult)!=0) {
D564 1
I564 1
		resolver_exit(1);
D570 1
I570 1
		resolver_exit(1);
D580 1
I580 1
		resolver_exit(1);
D586 1
I586 1
		resolver_exit(1);
D597 1
I597 1
			resolver_exit(1); /* Windows NT - set socket in non-blocking mode */
D603 1
I603 1
		resolver_exit(1);
D631 1
I631 1
	if (sockfd == INVALID_SOCKET)
D667 1
I667 1
		resolver_exit(1);
D975 1
I975 1
				resolver_exit(1);
D984 1
I984 1
				resolver_exit(1);
D993 1
I993 1
			resolver_exit(1);
D1000 1
I1000 1
			resolver_exit(1);
D1006 1
I1006 1
			resolver_exit(1);
D1013 1
I1013 1
			resolver_exit(1);
D1021 1
I1021 1
			resolver_exit(1);

mayer at pogo.udel.edu|ntpd/ntp_intres.c|20051016224309|56960
D 1.40.1.2 05/10/22 23:43:02-04:00 mayer at pogo.udel.edu +1 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #411 fix from Marc
K 56927
O -rw-rw-r--
P ntpd/ntp_intres.c
------------------------------------------------

D1078 1
I1078 1
		if (dores && SOCKNUL(&(ce->peer_store))) {

stenn at deacon.udel.edu|ntpd/ntp_intres.c|20051016071805|28535
D 1.42 05/11/03 23:39:56-05:00 mayer at pogo.udel.edu +0 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Auto merged
i mayer at pogo.udel.edu|ntpd/ntp_intres.c|20051016224309|56960
i mayer at pogo.udel.edu|ntpd/ntp_intres.c|20051023034302|56927
K 56927
M mayer at pogo.udel.edu|ntpd/ntp_intres.c|20051023034302|56927
O -rw-rw-r--
P ntpd/ntp_intres.c
------------------------------------------------

D474 1
D480 1

== ntpd/ntp_proto.c ==
stenn at whimsy.udel.edu|ntpd/ntp_proto.c|19990526004817|01635|3aed0663
stenn at deacon.udel.edu|ntpd/ntp_proto.c|20051002080812|60350
D 1.236.1.1 05/10/04 12:22:23-04:00 mayer at pogo.udel.edu +1 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fix extra y at beginning of file
K 60229
O -rw-rw-r--
P ntpd/ntp_proto.c
------------------------------------------------

D1 1
I1 1
/*

stenn at deacon.udel.edu|ntpd/ntp_proto.c|20051028013753|29097
D 1.247 05/11/03 23:39:57-05:00 mayer at pogo.udel.edu +0 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Auto merged
i mayer at pogo.udel.edu|ntpd/ntp_proto.c|20051004162223|60229
K 29097
M mayer at pogo.udel.edu|ntpd/ntp_proto.c|20051004162223|60229
O -rw-rw-r--
P ntpd/ntp_proto.c
------------------------------------------------

D2 1

== ntpdate/ntpdate.c ==
stenn at whimsy.udel.edu|ntpdate/ntpdate.c|19990526004819|01635|3aed0663
stenn at deacon.udel.edu|ntpdate/ntpdate.c|20050925031753|23667
D 1.53 05/11/01 23:40:06-05:00 mayer at pogo.udel.edu +41 -18
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug fixes to support IPv6 changes for non-IPv6 capable systems
K 6922
O -rw-rw-r--
P ntpdate/ntpdate.c
------------------------------------------------

I23 6
/* Don't include ISC's version of IPv6 variables and structures */
#define ISC_IPV6_H 1
#include "isc/net.h"
#include "isc/result.h"
#include "isc/sockaddr.h"
\
I49 4
#ifdef __QNXNTO__
# include "adjtime.h"
#endif
\
I353 6
\
	/* Check to see if we have IPv6. Otherwise force the -4 flag */
	if (isc_net_probeipv6() != ISC_R_SUCCESS) {
		ai_fam_templ = AF_INET;
	}
\
D608 3
D612 1
I613 1
#ifndef SYS_WINNT
I614 3
#else
				if (WSAGetLastError() != WSAEINTR)
#endif
I1421 10
	isc_sockaddr_t laddr;
	isc_sockaddr_t saddr;
\
	if(addr->ss_family == AF_INET) {
		isc_sockaddr_fromin( &laddr, &((struct sockaddr_in*)&addr)->sin_addr, 0);
	}
	else {
		isc_sockaddr_fromin6(&laddr, &((struct sockaddr_in6*)&addr)->sin6_addr, 0);
	}
\
D1430 6
I1435 2
		if(server->srcadr.ss_family == AF_INET) {
			isc_sockaddr_fromin(&saddr, &((struct sockaddr_in*)&server->srcadr)->sin_addr, 0);
D1438 6
I1443 8
			isc_sockaddr_fromin6(&saddr, &((struct sockaddr_in6*)&server->srcadr)->sin6_addr, 0);
		}
		if (isc_sockaddr_eqaddr(&laddr, &saddr) == ISC_TRUE)
			return server;
\
		if(addr->ss_family == server->srcadr.ss_family) {
			if (isc_sockaddr_ismulticast(&saddr) == ISC_TRUE)
				mc_server = server;
I1858 1
	if (cc == SOCKET_ERROR) {
D1860 1
D1863 1

# Patch checksum=3fcf4e1c


More information about the bk-ntp-dev-send mailing list