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

Harlan Stenn stenn at whimsy.udel.edu
Mon Jun 27 07:36:26 UTC 2005


This BitKeeper patch contains the following changesets:
mayer at pogo.udel.edu|ChangeSet|20050626021401|41351
mayer at pogo.udel.edu|ChangeSet|20050421035626|38639
mayer at pogo.udel.edu|ChangeSet|20050423202451|39864
mayer at pogo.udel.edu|ChangeSet|20050421032501|34135
mayer at tecotoo.|ChangeSet|20050417212753|34812
mayer at tecotoo.|ChangeSet|20050417032604|34282
mayer at pogo.udel.edu|ChangeSet|20050626021301|39872
mayer at pogo.udel.edu|ChangeSet|20050626163411|41531
mayer at pogo.udel.edu|ChangeSet|20050421035508|38612
stenn at whimsy.udel.edu|ChangeSet|20050627073347|41522

# 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:	whimsy.udel.edu
# Root:	/backroom/ntp-dev

#
#--- 1.4/ports/winnt/ntpd/ntservice.c	2005-02-15 00:18:08 -05:00
#+++ 1.5/ports/winnt/ntpd/ntservice.c	2005-04-16 23:19:51 -04:00
#@@ -20,6 +20,7 @@
# #include <config.h>
# #include <stdio.h>
# 
#+#include <ntp_cmdargs.h>
# #include "syslog.h"
# #include "ntservice.h"
# #include "clockstuff.h"
#@@ -37,6 +38,7 @@
# HANDLE hServDoneEvent = NULL;
# extern HANDLE WaitHandles[3];
# extern volatile int debug;
#+extern char *progname;
# 
# void uninit_io_completion_port();
# int ntpdmain(int argc, char *argv[]);
#@@ -63,9 +65,9 @@
# 	int rc,
# 	i = 1;
# 
#-  /* Save the command line parameters */
#-  glb_argc = argc;
#-  glb_argv = argv;
#+	/* Save the command line parameters */
#+	glb_argc = argc;
#+	glb_argv = argv;
# 
# 	/* Command line users should put -f in the options */
# 	while (argv[i]) {
#@@ -91,9 +93,13 @@
# 
# 		rc = StartServiceCtrlDispatcher(dispatchTable);
# 		if (!rc) {
#+			progname = argv[0];
# 			rc = GetLastError();
#-			fprintf(stderr, "StartServiceCtrlDispatcher returned: %i\n", rc);
#-			fprintf(stderr, "Use -f to run from the command line.\n");
#+#ifdef DEBUG
#+			fprintf(stderr, "%s: unable to start as service, rc: %i\n\n", progname, rc);
#+#endif
#+			ntpd_usage();
#+			fprintf(stderr, "\nUse -d, -q, or -n to run from the command line.\n");
# 			exit(rc);
# 		}
# 	}
#
#--- 1.2/include/ntp_cmdargs.h	2001-10-08 21:18:06 -04:00
#+++ 1.3/include/ntp_cmdargs.h	2005-04-16 23:15:27 -04:00
#@@ -2,3 +2,4 @@
# 
# extern	void	getstartup	P((int, char **));
# extern	void	getCmdOpts	P((int, char **));
#+extern	void	ntpd_usage	P((void));
#
#--- 1.31/libntp/Makefile.am	2004-12-23 22:38:13 -05:00
#+++ 1.32/libntp/Makefile.am	2005-04-20 23:54:14 -04:00
#@@ -25,11 +25,11 @@
# 	$(srcdir)/../libisc/netscope.c
# libntp_a_SOURCES = systime.c $(libntp_a_SRCS)
# libntpsim_a_SOURCES = systime_s.c $(libntp_a_SRCS)
#-EXTRA_libntp_a_SOURCES = adjtimex.c log.c random.c
#+EXTRA_libntp_a_SOURCES = adjtimex.c random.c
# INCLUDES = -I$(top_srcdir)/include -I../include
# ETAGS_ARGS = Makefile.am
# 
#-noinst_HEADERS = lib_strbuf.h log.h
#+noinst_HEADERS = lib_strbuf.h 
# 
# ../include/des.h:
# 	touch ../include/des.h
#
#--- 1.18/libntp/msyslog.c	2003-05-31 21:59:18 -04:00
#+++ 1.19/libntp/msyslog.c	2005-04-16 23:21:23 -04:00
#@@ -25,7 +25,6 @@
# 
# #ifdef SYS_WINNT
# # include <stdarg.h>
#-# include "..\ports\winnt\libntp\log.h"
# # include "..\ports\winnt\libntp\messages.h"
# #endif
# 
#
#--- 1.32/ntpd/cmd_args.c	2005-02-14 00:26:24 -05:00
#+++ 1.34/ntpd/cmd_args.c	2005-04-23 16:24:18 -04:00
#@@ -17,15 +17,33 @@
#  * Definitions of things either imported from or exported to outside
#  */
# extern char const *progname;
#+extern int default_ai_family;
# int	listen_to_virtual_ips = 1;
# char 	*specific_interface = NULL;        /* interface name or IP address to bind to */
# 
#-static const char *ntp_options = "aAbB:c:C:dD:f:gi:k:l:L:nNO:p:P:qr:s:S:t:T:W:u:v:V:xY:Z:-:";
#+static const char *ntp_options = "46aAbB:c:C:dD:f:gHi:k:l:L:nNO:p:P:qr:s:S:t:T:W:u:v:V:xY:Z:-:";
# 
# #ifdef HAVE_NETINFO
# extern int	check_netinfo;
# #endif
# 
#+
#+void ntpd_usage( void )
#+{
#+		(void) fprintf(stderr, "usage: %s [ -46abdgnqx ] [ -c config_file ]\n", progname);
#+		(void) fprintf(stderr, "\t\t[ -f drift_file ] [ -k key_file ] [ -l log_file ]\n");
#+		(void) fprintf(stderr, "\t\t[ -p pid_file ] [ -r broadcast_delay ] [ -s stats_dir ]\n");
#+		(void) fprintf(stderr, "\t\t[ -t trusted_key ] [ -v sys_var ] [ -V default_sysvar ]\n");
#+		(void) fprintf(stderr, "\t\t[ -L [ interface ] ]\n");
#+#if defined(HAVE_SCHED_SETSCHEDULER)
#+		(void) fprintf(stderr, "\t\t[ -P fixed_process_priority ]\n");
#+#endif
#+#ifdef HAVE_DROPROOT
#+		(void) fprintf(stderr, "\t\t[ -u user[:group] ] [ -i jaildir ]\n");
#+#endif
#+}  /* ntpd_usage */
#+
#+
# /*
#  * getstartup - search through the options looking for a debugging flag
#  */
#@@ -125,41 +143,30 @@
# 		    ++errflg;
# 		    break;
# 
#-	    case '-':
#-	      if ( ! strcmp(ntp_optarg, "version") ) {
#-		printf("%.80s: %.80s\n", progname, Version);
#-		exit(0);
#-	      } else if ( ! strcmp(ntp_optarg, "help") ) {
#-		/* usage(); */
#-		/* exit(0); */
#-		++errflg;
#-	      } else if ( ! strcmp(ntp_optarg, "copyright") ) {
#-		printf("unknown\n");
#-		exit(0);
#-	      } else {
#-		fprintf(stderr, "%.80s: Error unknown argument '--%.80s'\n",
#-			progname,
#-			ntp_optarg);
#-		exit(12);
#-	      }
#-	      break;
#+		case '-':
#+			if ( ! strcmp(ntp_optarg, "version") ) {
#+				printf("%.80s: %.80s\n", progname, Version);
#+				exit(0);
#+			} else if ( ! strcmp(ntp_optarg, "help") ) {
#+				ntpd_usage();
#+				exit(0);
#+			} else if ( ! strcmp(ntp_optarg, "copyright") ) {
#+				printf("unknown\n");
#+				exit(0);
#+			} else {
#+				fprintf(stderr, "%.80s: Error unknown argument '--%.80s'\n",
#+					progname,
#+					ntp_optarg);
#+				exit(12);
#+			}
#+			break;
# 
# 		default:
# 			break;
#-		}
#+	    }
# 
# 	if (errflg || ntp_optind != argc) {
#-		(void) fprintf(stderr, "usage: %s [ -abdgnqx ] [ -c config_file ] [ -e e_delay ]\n", progname);
#-		(void) fprintf(stderr, "\t\t[ -f freq_file ] [ -k key_file ] [ -l log_file ]\n");
#-		(void) fprintf(stderr, "\t\t[ -p pid_file ] [ -r broad_delay ] [ -s statdir ]\n");
#-		(void) fprintf(stderr, "\t\t[ -t trust_key ] [ -v sys_var ] [ -V default_sysvar ]\n");
#-		(void) fprintf(stderr, "\t\t[ -L interface ]\n");
#-#if defined(HAVE_SCHED_SETSCHEDULER)
#-		(void) fprintf(stderr, "\t\t[ -P fixed_process_priority ]\n");
#-#endif
#-#ifdef HAVE_DROPROOT
#-		(void) fprintf(stderr, "\t\t[ -u user[:group] ] [ -i chrootdir ]\n");
#-#endif
#+		ntpd_usage();
# 		exit(2);
# 	}
# 	ntp_optind = 0;	/* reset ntp_optind to restart ntp_getopt */
#@@ -204,6 +211,12 @@
# 	 */
# 	while ((c = ntp_getopt(argc, argv, ntp_options)) != EOF) {
# 		switch (c) {
#+		    case '4':
#+			default_ai_family = AF_INET;
#+			break;
#+		    case '6':
#+			default_ai_family = AF_INET6;
#+			break;
# 		    case 'a':
# 			proto_config(PROTO_AUTHENTICATE, 1, 0., NULL);
# 			break;
#@@ -397,17 +410,7 @@
# 	}
# 
# 	if (errflg || ntp_optind != argc) {
#-		(void) fprintf(stderr, "usage: %s [ -abdgnx ] [ -c config_file ] [ -e e_delay ]\n", progname);
#-		(void) fprintf(stderr, "\t\t[ -f freq_file ] [ -k key_file ] [ -l log_file ]\n");
#-		(void) fprintf(stderr, "\t\t[ -p pid_file ] [ -r broad_delay ] [ -s statdir ]\n");
#-		(void) fprintf(stderr, "\t\t[ -t trust_key ] [ -v sys_var ] [ -V default_sysvar ]\n");
#-		(void) fprintf(stderr, "\t\t[ -L interface ]\n");
#-#if defined(HAVE_SCHED_SETSCHEDULER)
#-		(void) fprintf(stderr, "\t\t[ -P fixed_process_priority ]\n");
#-#endif
#-#ifdef HAVE_DROPROOT
#-		(void) fprintf(stderr, "\t\t[ -u user[:group] ] [ -i chrootdir ]\n");
#-#endif
#+		ntpd_usage();
# 		exit(2);
# 	}
# 	return;
#
#--- 1.126/ntpd/ntp_config.c	2005-05-27 05:38:47 -04:00
#+++ 1.127/ntpd/ntp_config.c	2005-06-25 22:13:57 -04:00
#@@ -342,6 +342,8 @@
# /*
#  * Definitions of things either imported from or exported to outside
#  */
#+
#+int default_ai_family = AF_UNSPEC;	/* Default either IPv4 or IPv6 */
# char const *progname;
# char	*sys_phone[MAXPHONE] = {NULL}; /* ACTS phone numbers */
# char	*keysdir = NTP_KEYSDIR;	/* crypto keys directory */
#@@ -620,6 +622,7 @@
# 
# 			istart = 1;
# 			memset((char *)&peeraddr, 0, sizeof(peeraddr));
#+			peeraddr.ss_family = default_ai_family;
# 			switch (matchkey(tokens[istart], addr_type, 0)) {
# 			case CONF_ADDR_IPV4:
# 				peeraddr.ss_family = AF_INET;
#@@ -949,6 +952,7 @@
# 			if (ntokens > 1) {
# 				istart = 1;
# 				memset((char *)&peeraddr, 0, sizeof(peeraddr));
#+				peeraddr.ss_family = default_ai_family;
# 				switch (matchkey(tokens[istart],
# 				    addr_type, 0)) {
# 				case CONF_ADDR_IPV4:
#@@ -1227,6 +1231,7 @@
# 			}
# 			istart = 1;
# 			memset((char *)&peeraddr, 0, sizeof(peeraddr));
#+			peeraddr.ss_family = default_ai_family;
# 			switch (matchkey(tokens[istart], addr_type, 0)) {
# 			case CONF_ADDR_IPV4:
# 				peeraddr.ss_family = AF_INET;
#@@ -1417,6 +1422,7 @@
# 			}
# 			istart = 1;
# 			memset((char *)&peeraddr, 0, sizeof(peeraddr));
#+			peeraddr.ss_family = default_ai_family;
# 			switch (matchkey(tokens[istart], addr_type, 0)) {
# 			case CONF_ADDR_IPV4:
# 				peeraddr.ss_family = AF_INET;
#@@ -2062,28 +2068,7 @@
# 			if (ISEOL(*cp))
# 				break;
# 		}
#-		
#-
# 	}
#-
#-
#-       /* Heiko: Remove leading and trailing quotes around tokens */
#-       {
#-            int i,j = 0;
#-	    
#-		
#-	    for (i = 0; i < ntok; i++) {	    
#-                /* Now check if the first char is a quote and remove that */
#-                if ( tokenlist[ntok][0] == '"' )
#-                        tokenlist[ntok]++;
#-
#-                /* Now check the last char ... */
#-                j = strlen(tokenlist[ntok])-1;
#-                if ( tokenlist[ntok][j] == '"' )
#-                        tokenlist[ntok][j] = '\0';
#-	    }
#-							
#-        }
# 
# 	if (ntok == MAXTOKENS) {
# 		--ntok;
#
#--- 1.178/ntpd/ntp_io.c	2005-04-02 19:05:32 -05:00
#+++ 1.180/ntpd/ntp_io.c	2005-06-25 22:12:38 -04:00
#@@ -46,6 +46,7 @@
#  */
# #define ALLOW_WILDCARD_PACKETS
# 
#+
# extern int listen_to_virtual_ips;
# extern const char *specific_interface;
# 
#@@ -152,10 +153,14 @@
#  */
# #ifdef MCAST
# static	isc_boolean_t	addr_ismulticast	 P((struct sockaddr_storage *));
#-static	isc_boolean_t	socket_multicast_enable	 P((struct interface *, int, struct sockaddr_storage *));
#+static	isc_boolean_t	socket_multicast_enable	 P((struct interface *, int, int, struct sockaddr_storage *));
# static	isc_boolean_t	socket_multicast_disable P((struct interface *, int, struct sockaddr_storage *));
# #endif
# 
#+#ifdef DEBUG
#+static void print_interface	P((int));
#+#endif
#+
# typedef struct vsock vsock_t;
# 
# struct vsock {
#@@ -187,6 +192,8 @@
# isc_boolean_t address_okay	P((isc_interface_t *));
# void	convert_isc_if		P((isc_interface_t *, struct interface *, u_short));
# int	findlocalinterface	P((struct sockaddr_storage *));
#+int	findlocalcastinterface	P((struct sockaddr_storage *, int));
#+
# 
# #ifdef SYS_WINNT
# /*
#@@ -328,6 +335,27 @@
# 	printf("scopeid = %u\n", itf->scopeid);
# 
# }
#+
#+static void
#+print_interface(int ind) {
#+	printf("interface %d:  fd=%d,  bfd=%d,  name=%.8s,  flags=0x%x,  scope=%d\n",
#+	       ind,
#+	       inter_list[ind].fd,
#+	       inter_list[ind].bfd,
#+	       inter_list[ind].name,
#+	       inter_list[ind].flags,
#+	       inter_list[ind].scopeid);
#+	/* Leave these as three printf calls. */
#+	printf("              sin=%s", stoa((&inter_list[ind].sin)));
#+	if (inter_list[ind].flags & INT_BROADCAST)
#+	    printf("  bcast=%s", stoa((&inter_list[ind].bcast)));
#+	/* Only IPv4 has a network mask */
#+	if(inter_list[ind].family == AF_INET)
#+		printf(",  mask=%s", stoa((&inter_list[ind].mask)));
#+	printf("\n");
#+	if (debug > 4)	/* in-depth debugging only */
#+		interface_dump(&inter_list[ind]);
#+}
# #endif
# 
# int
#@@ -382,6 +410,7 @@
# 		inter_list[idx].sin.ss_family = AF_INET6;
# 		((struct sockaddr_in6*)&inter_list[idx].sin)->sin6_addr = in6addr_any;
# 		((struct sockaddr_in6*)&inter_list[idx].sin)->sin6_port = port;
#+		((struct sockaddr_in6*)&inter_list[idx].sin)->sin6_scope_id = 0;
# 		(void) strncpy(inter_list[idx].name, "wildcard", sizeof(inter_list[idx].name));
# 		inter_list[idx].mask.ss_family = AF_INET6;
# 		memset(&((struct sockaddr_in6*)&inter_list[idx].mask)->sin6_addr.s6_addr, 0xff, sizeof(struct in6_addr));
#@@ -445,6 +474,7 @@
# void
# convert_isc_if(isc_interface_t *isc_if, struct interface *itf, u_short port) {
# 
#+	itf->family = isc_if->af;
# 	if(isc_if->af == AF_INET) {
# 		itf->sin.ss_family = (u_short) isc_if->af;
# 		strcpy(itf->name, isc_if->name);
#@@ -496,6 +526,8 @@
# 		{
# 			loopback6_interface = itf;
# 		}
#+		/* Copy the scopeid and the interface index */
#+		itf->ifindex = isc_if->ifindex;
# 	}
# #endif /* ISC_PLATFORM_HAVEIPV6 */
# 
#@@ -510,9 +542,6 @@
# 	if((isc_if->flags & INTERFACE_F_MULTICAST) != 0)
# 		itf->flags |= INT_MULTICAST;
# 
#-	/* Copy the scopeid and the interface index */
#-	itf->ifindex = isc_if->ifindex;
#-	itf->scopeid = isc_if->scopeid;
# }
# /*
#  * create_sockets - create a socket for each interface plus a default
#@@ -668,23 +697,7 @@
# 	if (debug > 1) {
# 		printf("create_sockets: Total interfaces = %d\n", ninterfaces);
# 		for (i = 0; i < ninterfaces; i++) {
#-			printf("interface %d:  fd=%d,  bfd=%d,  name=%.8s,  flags=0x%x,  scope=%d\n",
#-			       i,
#-			       inter_list[i].fd,
#-			       inter_list[i].bfd,
#-			       inter_list[i].name,
#-			       inter_list[i].flags,
#-			       inter_list[i].scopeid);
#-			/* Leave these as three printf calls. */
#-			printf("              sin=%s",
#-			       stoa((&inter_list[i].sin)));
#-			if (inter_list[i].flags & INT_BROADCAST)
#-			    printf("  bcast=%s,",
#-				   stoa((&inter_list[i].bcast)));
#-			printf("  mask=%s\n",
#-			       stoa((&inter_list[i].mask)));
#-			if (debug > 4)	/* in-depth debugging only */
#-				interface_dump(&inter_list[i]);
#+			print_interface(i);
# 		}
# 	}
# #endif
#@@ -850,7 +863,7 @@
#  * multicasting. It is not this function's job to select the socket
#  */
# static isc_boolean_t
#-socket_multicast_enable(struct interface *iface, int ind, struct sockaddr_storage *maddr)
#+socket_multicast_enable(struct interface *iface, int ind, int lscope, struct sockaddr_storage *maddr)
# {
# #ifdef ISC_PLATFORM_HAVEIPV6
# 	struct ipv6_mreq mreq6;
#@@ -863,8 +876,13 @@
# 	{
# 	case AF_INET:
# 		mreq.imr_multiaddr = (((struct sockaddr_in*)maddr)->sin_addr);
#-		mreq.imr_interface.s_addr = ((struct sockaddr_in*)&iface->sin)->sin_addr.s_addr;
#-		mreq.imr_interface.s_addr = htonl(INADDR_ANY); 
#+/*
#+ * Temporarily just use INADDR_ANY for now
#+ * We should be checking if they're the same address
#+ * PDMXXX
#+ */
#+/*		mreq.imr_interface.s_addr = ((struct sockaddr_in*)&iface->sin)->sin_addr.s_addr; */
#+		mreq.imr_interface.s_addr = htonl(INADDR_ANY);
# 		if (setsockopt(iface->fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
# 			(char *)&mreq, sizeof(mreq)) == -1) {
# 			netsyslog(LOG_ERR,
#@@ -874,6 +892,15 @@
# 			mreq.imr_interface.s_addr, stoa(maddr));
# 			return ISC_FALSE;
# 		}
#+#ifdef DEBUG
#+		if (debug > 0) {
#+			printf(
#+			"Added IPv4 multicast membership on socket %d, addr %s for %x / %x (%s)\n",
#+			iface->fd, stoa(&iface->sin),
#+			mreq.imr_multiaddr.s_addr,
#+			mreq.imr_interface.s_addr, stoa(maddr));
#+		}
#+#endif
# 		break;
# 	case AF_INET6:
# #if defined(ISC_PLATFORM_HAVEIPV6) && defined(IPV6_JOIN_GROUP) && defined(IPV6_LEAVE_GROUP)
#@@ -886,12 +913,12 @@
# 		 */
# 		iaddr6 = ((struct sockaddr_in6*)maddr)->sin6_addr;
# 		mreq6.ipv6mr_multiaddr = iaddr6;
#-#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
#+#ifdef ISC_PLATFORM_HAVESCOPEID
# 		if (IN6_IS_ADDR_MC_LINKLOCAL(&iaddr6))
#-			mreq6.ipv6mr_interface = iface->scopeid;
#+			mreq6.ipv6mr_interface = lscope;
# 		else
# #endif
#-			mreq6.ipv6mr_interface = 0;
#+			mreq6.ipv6mr_interface = lscope;
# 
# 		if (setsockopt(iface->fd, IPPROTO_IPV6, IPV6_JOIN_GROUP,
# 			(char *)&mreq6, sizeof(mreq6)) == -1) {
#@@ -901,6 +928,14 @@
# 			mreq6.ipv6mr_interface, stoa(maddr));
# 			return ISC_FALSE;
# 		}
#+#ifdef DEBUG
#+		if (debug > 0) {
#+			printf(
#+			 "Added IPv6 multicast group on socket %d, addr %s for interface %d(%s)\n",
#+			iface->fd, stoa(&iface->sin),
#+			mreq6.ipv6mr_interface, stoa(maddr));
#+		}
#+#endif
# 		break;
# #else
# 		return ISC_FALSE;
#@@ -1019,6 +1054,7 @@
# 		/*
# 		 * Try to open the broadcast address
# 		 */
#+		inter_list[i].family = AF_INET;
# 		inter_list[i].bfd = open_socket(&inter_list[i].bcast,
# 				    INT_BROADCAST, 1, &inter_list[i], i);
# 
#@@ -1078,9 +1114,6 @@
# 	}
# }
# 
#-/*
#- * io_multicast_add() - add multicast group address
#- */
# void
# io_multicast_add(
# 	struct sockaddr_storage addr
#@@ -1090,6 +1123,8 @@
# 	int i = ninterfaces;	/* Use the next interface */
# 	isc_boolean_t jstatus;
# 	int ind;
#+	int lif = 0;
#+	int lscope = 0;
# 
# 	/*
# 	 * Check to see if this is a multicast address
#@@ -1105,6 +1140,7 @@
# 		return;
# 	}
# 
#+#ifndef MULTICAST_NONEWSOCKET
# 	/*
# 	 * Find an empty slot to use
# 	 */
#@@ -1137,6 +1173,8 @@
# 	 */
# 	memset((char *)&inter_list[ind], 0, sizeof(struct interface));
# 	inter_list[ind].sin.ss_family = addr.ss_family;
#+	inter_list[ind].family = addr.ss_family;
#+
# 	switch(addr.ss_family) {
# 	case AF_INET:
# 		memcpy(&(((struct sockaddr_in *)&inter_list[ind].sin)->sin_addr),
#@@ -1151,11 +1189,21 @@
# 		       &((struct sockaddr_in6*)&addr)->sin6_addr,
# 		       sizeof(struct in6_addr));
# 		((struct sockaddr_in6*)&inter_list[ind].sin)->sin6_port = htons(NTP_PORT);
#+#ifdef ISC_PLATFORM_HAVESCOPEID
#+		((struct sockaddr_in6*)&inter_list[ind].sin)->sin6_scope_id = ((struct sockaddr_in6*)&addr)->sin6_scope_id;
#+#endif
# 		memset(&((struct sockaddr_in6*)&inter_list[ind].mask)->sin6_addr.s6_addr, 0xff, sizeof(struct in6_addr));
# #endif
#+		lif = findlocalcastinterface(&addr, INT_MULTICAST);
#+		lscope = ((struct sockaddr_in6*)&inter_list[lif].sin)->sin6_scope_id;
#+#ifdef DEBUG
#+	if (debug > 1)
#+		printf("Found interface index %d, scope: %d for address %s\n",
#+			lif, lscope, stoa(&addr));
#+#endif
# 		break;
# 	}
#-		
#+
# 	inter_list[ind].bfd = INVALID_SOCKET;
# 	inter_list[ind].fd = open_socket(&inter_list[ind].sin,
# 			    INT_MULTICAST, 1, &inter_list[ind], ind);
#@@ -1166,20 +1214,25 @@
# 			sizeof(inter_list[ind].name));
# 		((struct sockaddr_in*)&inter_list[ind].mask)->sin_addr.s_addr =
# 						htonl(~(u_int32)0);
#-		inter_list[ind].ignore_packets = ISC_FALSE;
# 		if (ind >= ninterfaces)
# 			ninterfaces = ind + 1;
#+		print_interface(ind);
# 	}
# 	else
# 	{
# 		memset((char *)&inter_list[ind], 0, sizeof(struct interface));
#-		ind = findlocalinterface(&addr);
#+		ind = -1;
#+		if (addr.ss_family == AF_INET)
#+			ind = wildipv4;
#+		else if (addr.ss_family == AF_INET6)
#+			ind = wildipv6;
#+
# 		if (ind >= 0) {
# 			/* HACK ! -- stuff in an address */
# 			inter_list[ind].bcast = addr;
# 			netsyslog(LOG_ERR,
#-			 "...multicast address %s using socket %d",
#-			 stoa(&addr), ind);
#+			 "...multicast address %s using wildcard socket",
#+			 stoa(&addr));
# 		} else {
# 			netsyslog(LOG_ERR,
# 			"No multicast socket available to use for address %s",
#@@ -1188,15 +1241,34 @@
# 		}
# 	}
# 
#-	jstatus = socket_multicast_enable(&inter_list[ind], ind, &addr);
#+#else
#+	ind = findlocalinterface(&addr);
#+#endif
#+	/*
#+	 * If we don't have a valid socket, just return
#+	 */
#+	if (ind < 0)
#+	{
#+		netsyslog(LOG_ERR,
#+		"Cannot add multicast address %s: Cannot find slot",
#+		stoa(&addr));
#+		return;
#+	}
#+
#+	jstatus = socket_multicast_enable(&inter_list[ind], ind, lscope, &addr);
# 
# #ifdef DEBUG
# 	if (debug)
#-		printf("io_multicast_add %s on interface %d\n", stoa(&addr), ind);
#+	{
#+		if (jstatus == ISC_TRUE)
#+			printf("io_multicast_add: %s on interface %d\n", stoa(&addr), ind);
#+		else
#+			printf("io_multicast_add: Failed to add %s on interface %d\n", stoa(&addr), ind);
#+	}
# #endif
# #else /* MCAST */
# 	netsyslog(LOG_ERR,
#-	    "Cannot add multicast address %s: no multicast support",
#+	    "Cannot add multicast address %s: no Multicast support",
# 	    stoa(&addr));
# #endif /* MCAST */
# }
#@@ -1393,12 +1465,14 @@
# 				fd, addr->ss_family, (int)ntohs(((struct sockaddr_in*)addr)->sin_port),
# 				stoa(addr),
# 				IN_CLASSD(ntohl(((struct sockaddr_in*)addr)->sin_addr.s_addr)), flags);
#+#ifdef ISC_PLATFORM_HAVEIPV6
# 		else if(addr->ss_family == AF_INET6)
# 		                sprintf(buff,
#-                                "bind() fd %d, family %d, port %d, addr %s, in6_is_addr_multicast=%d flags=%d fails: %%m",
#+                                "bind() fd %d, family %d, port %d, scope %d, addr %s, in6_is_addr_multicast=%d flags=%d fails: %%m",
#                                 fd, addr->ss_family, (int)ntohs(((struct sockaddr_in6*)addr)->sin6_port),
#-                                stoa(addr),
#+                                ((struct sockaddr_in6*)addr)->sin6_scope_id, stoa(addr),
#                                 IN6_IS_ADDR_MULTICAST(&((struct sockaddr_in6*)addr)->sin6_addr), flags);
#+#endif
# 		else return INVALID_SOCKET;
# 
# 		/*
#@@ -2231,7 +2305,7 @@
# 	}
# }
# /*
#- * findinterface - find local interface index corresponding to address
#+ * findlocalinterface - find local interface index corresponding to address
#  */
# int
# findlocalinterface(
#@@ -2257,11 +2331,17 @@
# 	 */
# 	memset(&saddr, 0, sizeof(saddr));
# 	saddr.ss_family = addr->ss_family;
#-	if(addr->ss_family == AF_INET)
#+	if(addr->ss_family == AF_INET) {
# 		memcpy(&((struct sockaddr_in*)&saddr)->sin_addr, &((struct sockaddr_in*)addr)->sin_addr, sizeof(struct in_addr));
#-	else if(addr->ss_family == AF_INET6)
#+		((struct sockaddr_in*)&saddr)->sin_port = htons(2000);
#+	}
#+#ifdef ISC_PLATFORM_HAVEIPV6
#+	else if(addr->ss_family == AF_INET6) {
# 		memcpy(&((struct sockaddr_in6*)&saddr)->sin6_addr, &((struct sockaddr_in6*)addr)->sin6_addr, sizeof(struct in6_addr));
#-	((struct sockaddr_in*)&saddr)->sin_port = htons(2000);
#+		((struct sockaddr_in6*)&saddr)->sin6_port = htons(2000);
#+		((struct sockaddr_in6*)&saddr)->sin6_scope_id = ((struct sockaddr_in6*)addr)->sin6_scope_id;
#+	}
#+#endif
# 	s = socket(addr->ss_family, SOCK_DGRAM, 0);
# 	if (s == INVALID_SOCKET)
# 		return (-1);
#@@ -2311,6 +2391,78 @@
# 	}
# 
# 	return (-1);
#+}
#+
#+/*
#+ * findlocalcastinterface - find local *cast interface index corresponding to address
#+ * depending on the flags passed
#+ */
#+int
#+findlocalcastinterface(
#+	struct sockaddr_storage *addr, int flags
#+	)
#+{
#+	int i;
#+	int nif = -1;
#+
#+	isc_boolean_t want_linklocal = ISC_FALSE; 
#+#if defined(ISC_PLATFORM_HAVEIPV6) && defined(IPV6_JOIN_GROUP) && defined(IPV6_LEAVE_GROUP)
#+	if (addr_ismulticast(addr) && flags == INT_MULTICAST)
#+	{
#+		if (IN6_IS_ADDR_MC_LINKLOCAL(&((struct sockaddr_in6*)addr)->sin6_addr))
#+		{
#+			want_linklocal = ISC_TRUE;
#+		}
#+		else if (IN6_IS_ADDR_MC_SITELOCAL(&((struct sockaddr_in6*)addr)->sin6_addr))
#+		{
#+			want_linklocal = ISC_TRUE;
#+		}
#+	}
#+#endif
#+
#+
#+	for (i = nwilds; i < ninterfaces; i++) {
#+		/* use only allowed addresses */
#+		if (inter_list[i].ignore_packets == ISC_TRUE)
#+			continue;
#+
#+		/* Skip the loopback addresses */
#+		if (inter_list[i].flags & INT_LOOPBACK)
#+			continue;
#+
#+		/* Skip if different family */
#+		if(inter_list[i].family != addr->ss_family)
#+			continue;
#+
#+		/* Is this it one of these based on flags? */
#+		if (!(inter_list[i].flags & flags))
#+			continue;
#+
#+		/* for IPv6 multicast check the address for linklocal */
#+#if defined(ISC_PLATFORM_HAVEIPV6) && defined(IPV6_JOIN_GROUP) && defined(IPV6_LEAVE_GROUP)
#+		if (flags == INT_MULTICAST &&
#+		   (IN6_IS_ADDR_LINKLOCAL(&((struct sockaddr_in6*)&inter_list[i].sin)->sin6_addr))
#+		   && want_linklocal == ISC_TRUE)
#+		{
#+			nif = i;
#+			break;
#+		}
#+		/* If we want a linklocal address and this isn't it, skip */\
#+		if (want_linklocal == ISC_TRUE)
#+			continue;
#+#endif
#+		/* Otherwise just look for the flag */
#+		if((inter_list[i].flags & flags))
#+		{
#+			nif = i;
#+			break;
#+		}
#+	}
#+#ifdef DEBUG
#+	if (debug > 1)
#+		printf("findlocalcastinterface: found index = %d\n", nif);
#+#endif
#+	return (nif);
# }
# 
# /*
#
#--- 1.67/ntpd/ntpd.c	2005-04-16 23:22:57 -04:00
#+++ 1.68/ntpd/ntpd.c	2005-06-25 22:13:58 -04:00
#@@ -129,6 +129,11 @@
# # define SIGDIE4 	SIGTERM
# #endif /* SYS_WINNT */
# 
#+#ifdef HAVE_DNSREGISTRATION
#+#include <dns_sd.h>
#+DNSServiceRef mdns;
#+#endif
#+
# /*
#  * Scheduling priority we run at
#  */
#@@ -461,6 +466,13 @@
# 	get_systime(&now);
# 	SRANDOM((int)(now.l_i * now.l_uf));
# 
#+#ifdef HAVE_DNSREGISTRATION
#+	msyslog(LOG_INFO, "Attemping to register mDNS\n");
#+	if ( DNSServiceRegister (&mdns, 0, 0, NULL, "_ntp._udp", NULL, NULL, htons(NTP_PORT), 0, NULL, NULL, NULL) != kDNSServiceErr_NoError ) {
#+		msyslog(LOG_ERR, "Unable to register mDNS\n");
#+	}
#+#endif
#+
# #if !defined(VMS)
# # ifndef NODETACH
# 	/*
#@@ -960,6 +972,10 @@
# {
# 
# 	msyslog(LOG_NOTICE, "ntpd exiting on signal %d", sig);
#+#ifdef HAVE_DNSREGISTRATION
#+	if (mdns != NULL)
#+	DNSServiceRefDeallocate(mdns);
#+#endif
# 
# 	switch (sig)
# 	{
#
#--- 1.37/ports/winnt/include/config.h	2005-05-30 07:17:51 -04:00
#+++ 1.38/ports/winnt/include/config.h	2005-06-26 12:33:08 -04:00
#@@ -97,8 +97,10 @@
# 
# int NT_set_process_priority(void);	/* Define this function */
# 
#-# define MCAST				/* Enable Multicast Support */												
#-# define REFCLOCK				/* from ntpd.mak */
#+# define MCAST				/* Enable Multicast Support */
#+# define MULTICAST_NONEWSOCKET		/* Don't create a new socket for mcast address */
#+
#+# define REFCLOCK			/* from ntpd.mak */
# 
# # define CLOCK_LOCAL			/* from ntpd.mak */
# //# define CLOCK_PARSE 
#@@ -107,7 +109,7 @@
# # define CLOCK_HOPF_SERIAL	/* device 38, hopf DCF77/GPS serial line receiver  */
# # define CLOCK_HOPF_PCI		/* device 39, hopf DCF77/GPS PCI-Bus receiver  */
# # define CLOCK_NMEA
#-# define CLOCK_PALISADE		 /* from ntpd.mak */
#+# define CLOCK_PALISADE		/* from ntpd.mak */
# # define CLOCK_DUMBCLOCK
# # define CLOCK_TRIMBLEDC
# # define CLOCK_TRIMTSIP 1
#
#--- 1.5/ports/winnt/instsrv/Instsrv.dsp	2002-03-23 21:10:20 -05:00
#+++ 1.6/ports/winnt/instsrv/Instsrv.dsp	2005-04-16 23:25:00 -04:00
#@@ -42,7 +42,7 @@
# # PROP Ignore_Export_Lib 0
# # PROP Target_Dir ""
# # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
#-# ADD CPP /nologo /MT /W4 /GX /O2 /I "..\..\..\include" /I "..\include" /I "." /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /YX"windows.h" /FD /c
#+# ADD CPP /nologo /MT /W4 /GX /O2 /I "..\..\..\include" /I "..\include" /I "." /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /YX"windows.h" /FD /c
# # ADD BASE RSC /l 0x409 /d "NDEBUG"
# # ADD RSC /l 0x409 /d "NDEBUG"
# BSC32=bscmake.exe
#
#--- 1.24/ports/winnt/libntp/libntp.dsp	2004-12-23 22:38:34 -05:00
#+++ 1.25/ports/winnt/libntp/libntp.dsp	2005-04-16 23:24:18 -04:00
#@@ -246,10 +246,6 @@
# # End Source File
# # Begin Source File
# 
#-SOURCE=.\log.c
#-# End Source File
#-# Begin Source File
#-
# SOURCE=..\..\..\libntp\machines.c
# # End Source File
# # Begin Source File
#@@ -483,10 +479,6 @@
# # Begin Source File
# 
# SOURCE=..\..\..\libntp\lib_strbuf.h
#-# End Source File
#-# Begin Source File
#-
#-SOURCE=.\log.h
# # End Source File
# # Begin Source File
# 
#
#--- 1.16/ports/winnt/ntpd/nt_clockstuff.c	2004-11-09 22:02:16 -05:00
#+++ 1.17/ports/winnt/ntpd/nt_clockstuff.c	2005-04-16 23:20:47 -04:00
#@@ -49,7 +49,6 @@
# #include "clockstuff.h"
# #include "ntservice.h"
# #include "ntp_timer.h"
#-# include "../libntp/log.h"
# 
# extern double sys_residual;	/* residual from previous adjustment */
# 
#@@ -165,7 +164,6 @@
# 		msyslog(LOG_ERR, "GetModuleFileName(PGM_EXE_FILE) failed: %m\n");
# 		exit(1);
# 	}
#-	addSourceToRegistry("NTP", szMsgPath);
# 
# 	/* Initialize random file before OpenSSL checks */
# 	if(!init_randfile())
#

# Diff checksum=8c99df1b


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
mayer at tecotoo.|ChangeSet|20050310032303|37216
D 1.1343.1.2 05/04/16 23:26:04-04:00 mayer at tecotoo. +10 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Martin Burnicki's cleanup of command line options and setting the registry for NTP
K 34282
P ChangeSet
------------------------------------------------

0a0
> mayer at tecotoo.myibg.com|ports/winnt/libntp/log.c|20030504145036|24435|87fe33f8 mayer at tecotoo.|BitKeeper/deleted/.del-log.c~87fe33f8|20050417031157|19280
> stenn at whimsy.udel.edu|ports/winnt/libntp/log.h|19990728020416|01289|29080509 mayer at tecotoo.|BitKeeper/deleted/.del-log.h~29080509|20050417031202|29949
> stenn at whimsy.udel.edu|include/ntp_cmdargs.h|20000730070518|59255|0620e777 mayer at tecotoo.|include/ntp_cmdargs.h|20050417031527|11844
> stenn at whimsy.udel.edu|libntp/msyslog.c|19990526004816|01635|3aed0663 mayer at tecotoo.|libntp/msyslog.c|20050417032123|24653
> stenn at whimsy.udel.edu|ntpd/cmd_args.c|20000730070522|59255|0620e777 mayer at tecotoo.|ntpd/cmd_args.c|20050417031535|19051
> stenn at whimsy.udel.edu|ntpd/ntpd.c|19990526004817|01635|3aed0663 mayer at tecotoo.|ntpd/ntpd.c|20050417032257|34167
> stenn at whimsy.udel.edu|ports/winnt/instsrv/Instsrv.dsp|19990728020408|01289|29080509 mayer at tecotoo.|ports/winnt/instsrv/Instsrv.dsp|20050417032500|55872
> stenn at whimsy.udel.edu|ports/winnt/libntp/libntp.dsp|19990728020416|01289|29080509 mayer at tecotoo.|ports/winnt/libntp/libntp.dsp|20050417032418|43298
> stenn at whimsy.udel.edu|ports/winnt/ntpd/nt_clockstuff.c|19991016040804|07763|8b711e53 mayer at tecotoo.|ports/winnt/ntpd/nt_clockstuff.c|20050417032047|64732
> mayer at tecotoo.|ports/winnt/ntpd/ntservice.c|20041103041356|55490|a153099e mayer at tecotoo.|ports/winnt/ntpd/ntservice.c|20050417031951|02561

stenn at whimsy.udel.edu|ChangeSet|20050412214336|37746
D 1.1373 05/04/17 17:27:53-04:00 mayer at tecotoo. +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Merge mayer at pogo.udel.edu:ntp-dev/ into tecotoo.:H:/ntpbk/ntp-dev
i mayer at tecotoo.|ChangeSet|20050417032604|34282
K 34812
M mayer at tecotoo.|ChangeSet|20050417032604|34282
P ChangeSet
------------------------------------------------


mayer at tecotoo.|ChangeSet|20050417212753|34812
D 1.1374 05/04/20 23:25:01-04:00 mayer at pogo.udel.edu +3 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Changes for multicasting
K 34135
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|libntp/log.c|19990526004817|01682|3e480692 mayer at pogo.udel.edu|libntp/log.c|20050417222224|04245
> stenn at whimsy.udel.edu|libntp/log.h|19990526004817|01682|3e480692 mayer at pogo.udel.edu|libntp/log.h|20050417222249|64192
> stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663 mayer at pogo.udel.edu|ntpd/ntp_io.c|20050421032443|29206

mayer at pogo.udel.edu|ChangeSet|20050421032501|34135
D 1.1375 05/04/20 23:55:08-04:00 mayer at pogo.udel.edu +3 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Remove log.* from make files
K 38612
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|libntp/log.c|19990526004817|01682|3e480692 mayer at pogo.udel.edu|BitKeeper/deleted/.del-log.c~3e480692|20050421032937|52161
> stenn at whimsy.udel.edu|libntp/log.h|19990526004817|01682|3e480692 mayer at pogo.udel.edu|BitKeeper/deleted/.del-log.h~3e480692|20050421032943|29473
> stenn at whimsy.udel.edu|libntp/Makefile.am|19990526004815|01635|3aed0663 mayer at pogo.udel.edu|libntp/Makefile.am|20050421035414|14812

mayer at pogo.udel.edu|ChangeSet|20050421035508|38612
D 1.1376 05/04/20 23:56:26-04:00 mayer at pogo.udel.edu +0 -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 stenn at whimsy.udel.edu|ChangeSet|20050418050132|37738
i stenn at whimsy.udel.edu|ChangeSet|20050419022949|37773
K 38639
M stenn at whimsy.udel.edu|ChangeSet|20050419022949|37773
P ChangeSet
------------------------------------------------


mayer at pogo.udel.edu|ChangeSet|20050421035626|38639
D 1.1377 05/04/23 16:24:51-04:00 mayer at pogo.udel.edu +2 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Added support for -4 and -6 command line options
K 39864
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/cmd_args.c|20000730070522|59255|0620e777 mayer at pogo.udel.edu|ntpd/cmd_args.c|20050423202418|30082
> stenn at whimsy.udel.edu|ntpd/ntp_config.c|19990526004817|01635|3aed0663 mayer at pogo.udel.edu|ntpd/ntp_config.c|20050423202418|32944

mayer at pogo.udel.edu|ChangeSet|20050423202451|39864
D 1.1378 05/06/25 22:13:01-04:00 mayer at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fixes for IPv6 multicast at least for FreeBSD
K 39872
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663 mayer at pogo.udel.edu|ntpd/ntp_io.c|20050626021238|22673

mayer at pogo.udel.edu|ChangeSet|20050626021301|39872
D 1.1379 05/06/25 22:14:01-04: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 stenn at whimsy.udel.edu|ChangeSet|20050421040847|38769
i stenn at whimsy.udel.edu|ChangeSet|20050421042340|38759
i stenn at whimsy.udel.edu|ChangeSet|20050421042725|38755
i stenn at whimsy.udel.edu|ChangeSet|20050427080954|38994
i stenn at whimsy.udel.edu|ChangeSet|20050427095339|38991
i stenn at whimsy.udel.edu|ChangeSet|20050506035529|39294
i stenn at whimsy.udel.edu|ChangeSet|20050506042353|44288
i stenn at whimsy.udel.edu|ChangeSet|20050517051718|44360
i stenn at whimsy.udel.edu|ChangeSet|20050518093608|45371
i kardel at pogo.udel.edu|ChangeSet|20050521105309|39240
i kardel at pogo.udel.edu|ChangeSet|20050526193221|38965
i kardel at pogo.udel.edu|ChangeSet|20050526193608|38980
i kardel at pogo.udel.edu|ChangeSet|20050526220519|38789
i kardel at pogo.udel.edu|ChangeSet|20050528054727|40093
i stenn at pogo.udel.edu|ChangeSet|20050528085856|40109
i kardel at pogo.udel.edu|ChangeSet|20050528101303|40118
i stenn at pogo.udel.edu|ChangeSet|20050528102719|40035
i stenn at pogo.udel.edu|ChangeSet|20050528102737|39597
i stenn at whimsy.udel.edu|ChangeSet|20050530050252|39750
i martin at pc-martin4.|ChangeSet|20050530111756|39814
i stenn at whimsy.udel.edu|ChangeSet|20050610025743|39821
i stenn at whimsy.udel.edu|ChangeSet|20050611063512|40054
i stenn at whimsy.udel.edu|ChangeSet|20050614045612|40055
i stenn at whimsy.udel.edu|ChangeSet|20050624012053|40045
i stenn at whimsy.udel.edu|ChangeSet|20050624012416|40046
K 41351
M stenn at whimsy.udel.edu|ChangeSet|20050624012416|40046
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntp_config.c|19990526004817|01635|3aed0663 mayer at pogo.udel.edu|ntpd/ntp_config.c|20050626021357|38764
> stenn at whimsy.udel.edu|ntpd/ntpd.c|19990526004817|01635|3aed0663 mayer at pogo.udel.edu|ntpd/ntpd.c|20050626021358|03178

mayer at pogo.udel.edu|ChangeSet|20050626021401|41351
D 1.1380 05/06/26 12:34:11-04:00 mayer at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Added MULTICAST_NONEWSOCKET to configuration, Windows doesn't allow separate socket for multicast
K 41531
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ports/winnt/include/config.h|19990728020335|01289|29080509 mayer at pogo.udel.edu|ports/winnt/include/config.h|20050626163308|58829

mayer at pogo.udel.edu|ChangeSet|20050626163411|41531
D 1.1381 05/06/27 03:33:47-04:00 stenn at whimsy.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Merge pogo:/usa/mayer/ntp-dev into whimsy.udel.edu:/backroom/ntp-dev
i stenn at whimsy.udel.edu|ChangeSet|20050627072338|40037
K 41522
M stenn at whimsy.udel.edu|ChangeSet|20050627072338|40037
P ChangeSet
------------------------------------------------


== BitKeeper/deleted/.del-log.c~87fe33f8 ==
mayer at tecotoo.myibg.com|ports/winnt/libntp/log.c|20030504145036|24435|87fe33f8
stenn at whimsy.udel.edu|ports/winnt/libntp/log.c|20030726193616|31083
D 1.3 05/04/16 23:11:57-04:00 mayer at tecotoo. +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Delete: ports/winnt/libntp/log.c
K 19280
O -rw-rw-r--
P BitKeeper/deleted/.del-log.c~87fe33f8
------------------------------------------------


== ports/winnt/ntpd/ntservice.c ==
mayer at tecotoo.|ports/winnt/ntpd/ntservice.c|20041103041356|55490|a153099e
mayer at tecotoo.|ports/winnt/ntpd/ntservice.c|20050215051808|57892
D 1.5 05/04/16 23:19:51-04:00 mayer at tecotoo. +11 -5
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Martin Burnicki's changes to fix ntpd usage message
K 2561
O -rw-rw-rw-
P ports/winnt/ntpd/ntservice.c
------------------------------------------------

I22 1
#include <ntp_cmdargs.h>
I39 1
extern char *progname;
D66 3
I68 3
	/* Save the command line parameters */
	glb_argc = argc;
	glb_argv = argv;
I93 1
			progname = argv[0];
D95 2
I96 5
#ifdef DEBUG
			fprintf(stderr, "%s: unable to start as service, rc: %i\n\n", progname, rc);
#endif
			ntpd_usage();
			fprintf(stderr, "\nUse -d, -q, or -n to run from the command line.\n");

== include/ntp_cmdargs.h ==
stenn at whimsy.udel.edu|include/ntp_cmdargs.h|20000730070518|59255|0620e777
stenn at whimsy.udel.edu|include/ntp_cmdargs.h|20011009011806|12481
D 1.3 05/04/16 23:15:27-04:00 mayer at tecotoo. +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Martin Burnicki's changes to fix ntpd usage message
K 11844
O -rw-rw-r--
P include/ntp_cmdargs.h
------------------------------------------------

I4 1
extern	void	ntpd_usage	P((void));

== libntp/Makefile.am ==
stenn at whimsy.udel.edu|libntp/Makefile.am|19990526004815|01635|3aed0663
mayer at tecotoo.|libntp/Makefile.am|20041224033813|15783
D 1.32 05/04/20 23:54:14-04:00 mayer at pogo.udel.edu +2 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Remove log.* from make files
K 14812
O -rw-rw-r--
P libntp/Makefile.am
------------------------------------------------

D28 1
I28 1
EXTRA_libntp_a_SOURCES = adjtimex.c random.c
D32 1
I32 1
noinst_HEADERS = lib_strbuf.h 

== BitKeeper/deleted/.del-log.c~3e480692 ==
stenn at whimsy.udel.edu|libntp/log.c|19990526004817|01682|3e480692
mayer at tecotoo.myibg.com|libntp/log.c|20030424154933|13945
D 1.5 05/04/17 18:18:17-04:00 mayer at pogo.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
c Delete: libntp/log.c
K 43926
O -rw-rw-r--
P BitKeeper/deleted/.del-log.c~3e480692
------------------------------------------------


mayer at pogo.udel.edu|BitKeeper/deleted/.del-log.c~3e480692|20050417221817|43926
D 1.6 05/04/17 18:22:24-04:00 mayer at pogo.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Rename: BitKeeper/deleted/.del-log.c~3e480692 -> libntp/log.c
K 4245
O -rw-rw-r--
P libntp/log.c
------------------------------------------------


mayer at pogo.udel.edu|libntp/log.c|20050417222224|04245
D 1.7 05/04/20 23:29:37-04:00 mayer at pogo.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Delete: libntp/log.c
K 52161
O -rw-rw-r--
P BitKeeper/deleted/.del-log.c~3e480692
------------------------------------------------


== BitKeeper/deleted/.del-log.h~3e480692 ==
stenn at whimsy.udel.edu|libntp/log.h|19990526004817|01682|3e480692
stenn at whimsy.udel.edu|libntp/log.h|20011009011811|28492
D 1.3 05/04/17 18:18:20-04:00 mayer at pogo.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
c Delete: libntp/log.h
K 3448
O -rw-rw-r--
P BitKeeper/deleted/.del-log.h~3e480692
------------------------------------------------


mayer at pogo.udel.edu|BitKeeper/deleted/.del-log.h~3e480692|20050417221820|03448
D 1.4 05/04/17 18:22:49-04:00 mayer at pogo.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Rename: BitKeeper/deleted/.del-log.h~3e480692 -> libntp/log.h
K 64192
O -rw-rw-r--
P libntp/log.h
------------------------------------------------


mayer at pogo.udel.edu|libntp/log.h|20050417222249|64192
D 1.5 05/04/20 23:29:43-04:00 mayer at pogo.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Delete: libntp/log.h
K 29473
O -rw-rw-r--
P BitKeeper/deleted/.del-log.h~3e480692
------------------------------------------------


== libntp/msyslog.c ==
stenn at whimsy.udel.edu|libntp/msyslog.c|19990526004816|01635|3aed0663
mayer at tecotoo.myibg.com|libntp/msyslog.c|20030601015918|28279
D 1.19 05/04/16 23:21:23-04:00 mayer at tecotoo. +0 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Martin Burnicki's changes to remove unnecessary log.h include
K 24653
O -rw-rw-r--
P libntp/msyslog.c
------------------------------------------------

D28 1

== ntpd/cmd_args.c ==
stenn at whimsy.udel.edu|ntpd/cmd_args.c|20000730070522|59255|0620e777
mayer at tecotoo.|ntpd/cmd_args.c|20050214052624|65444
D 1.33 05/04/16 23:15:35-04:00 mayer at tecotoo. +38 -42
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Martin Burnicki's changes to fix ntpd usage message
K 19051
O -rw-rw-r--
P ntpd/cmd_args.c
------------------------------------------------

D23 1
I23 1
static const char *ntp_options = "aAbB:c:C:dD:f:gHi:k:l:L:nNO:p:P:qr:s:S:t:T:W:u:v:V:xY:Z:-:";
I28 17
\
void ntpd_usage( void )
{
		(void) fprintf(stderr, "usage: %s [ -abdgnqx ] [ -c config_file ]\n", progname);
		(void) fprintf(stderr, "\t\t[ -f drift_file ] [ -k key_file ] [ -l log_file ]\n");
		(void) fprintf(stderr, "\t\t[ -p pid_file ] [ -r broadcast_delay ] [ -s stats_dir ]\n");
		(void) fprintf(stderr, "\t\t[ -t trusted_key ] [ -v sys_var ] [ -V default_sysvar ]\n");
		(void) fprintf(stderr, "\t\t[ -L [ interface ] ]\n");
#if defined(HAVE_SCHED_SETSCHEDULER)
		(void) fprintf(stderr, "\t\t[ -P fixed_process_priority ]\n");
#endif
#ifdef HAVE_DROPROOT
		(void) fprintf(stderr, "\t\t[ -u user[:group] ] [ -i jaildir ]\n");
#endif
}  /* ntpd_usage */
\
\
D128 18
I145 17
		case '-':
			if ( ! strcmp(ntp_optarg, "version") ) {
				printf("%.80s: %.80s\n", progname, Version);
				exit(0);
			} else if ( ! strcmp(ntp_optarg, "help") ) {
				ntpd_usage();
				exit(0);
			} else if ( ! strcmp(ntp_optarg, "copyright") ) {
				printf("unknown\n");
				exit(0);
			} else {
				fprintf(stderr, "%.80s: Error unknown argument '--%.80s'\n",
					progname,
					ntp_optarg);
				exit(12);
			}
			break;
D149 1
I149 1
	    }
D152 11
I162 1
		ntpd_usage();
D400 11
I410 1
		ntpd_usage();

mayer at tecotoo.|ntpd/cmd_args.c|20050417031535|19051
D 1.34 05/04/23 16:24:18-04:00 mayer at pogo.udel.edu +9 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Added support for -4 and -6 command line options
K 30082
O -rw-rw-r--
P ntpd/cmd_args.c
------------------------------------------------

I19 1
extern int default_ai_family;
D23 1
I23 1
static const char *ntp_options = "46aAbB:c:C:dD:f:gHi:k:l:L:nNO:p:P:qr:s:S:t:T:W:u:v:V:xY:Z:-:";
D32 1
I32 1
		(void) fprintf(stderr, "usage: %s [ -46abdgnqx ] [ -c config_file ]\n", progname);
I212 6
		    case '4':
			default_ai_family = AF_INET;
			break;
		    case '6':
			default_ai_family = AF_INET6;
			break;

== ntpd/ntp_config.c ==
stenn at whimsy.udel.edu|ntpd/ntp_config.c|19990526004817|01635|3aed0663
root at sonne.|ntpd/ntp_config.c|20050331091507|46244
D 1.123.1.1 05/04/23 16:24:18-04:00 mayer at pogo.udel.edu +6 -21
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Added support for -4 and -6 command line options
K 32944
O -rw-rw-r--
P ntpd/ntp_config.c
------------------------------------------------

I343 2
\
int default_ai_family = AF_UNSPEC;	/* Default either IPv4 or IPv6 */
I621 1
			peeraddr.ss_family = default_ai_family;
I951 1
				peeraddr.ss_family = default_ai_family;
I1225 1
			peeraddr.ss_family = default_ai_family;
I1415 1
			peeraddr.ss_family = default_ai_family;
D2061 2
D2064 19

stenn at whimsy.udel.edu|ntpd/ntp_config.c|20050527093847|52064
D 1.127 05/06/25 22:13:57-04:00 mayer at pogo.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Auto merged
i mayer at pogo.udel.edu|ntpd/ntp_config.c|20050423202418|32944
K 38764
M mayer at pogo.udel.edu|ntpd/ntp_config.c|20050423202418|32944
O -rw-rw-r--
P ntpd/ntp_config.c
------------------------------------------------


== ntpd/ntp_io.c ==
stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663
mayer at pogo.udel.edu|ntpd/ntp_io.c|20050403000532|40821
D 1.179 05/04/20 23:24:43-04:00 mayer at pogo.udel.edu +35 -11
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Changes for multicasting
K 29206
O -rw-rw-r--
P ntpd/ntp_io.c
------------------------------------------------

D866 2
I867 7
/*
 * Temporarily just use INADDR_ANY for now
 * We should be checking if they're the same address
 * PDMXXX
 */
/*		mreq.imr_interface.s_addr = ((struct sockaddr_in*)&iface->sin)->sin_addr.s_addr; */
		mreq.imr_interface.s_addr = htonl(INADDR_ANY);
I876 9
#ifdef DEBUG
		if (debug > 0) {
			printf(
			"Added IPv4 multicast membership on socket %d, addr %s for %x / %x (%s)\n",
			iface->fd, stoa(&iface->sin),
			mreq.imr_multiaddr.s_addr,
			mreq.imr_interface.s_addr, stoa(maddr));
		}
#endif
D891 1
I891 1
			mreq6.ipv6mr_interface = ((struct sockaddr_in6*)&iface->sin)->sin6_scope_id;
I903 8
#ifdef DEBUG
		if (debug > 0) {
			printf(
			 "Added IPv6 multicast group on socket %d, addr %s for interface %d(%s)\n",
			iface->fd, stoa(&iface->sin),
			mreq6.ipv6mr_interface, stoa(maddr));
		}
#endif
D1081 3
I1153 1
		((struct sockaddr_in6*)&inter_list[ind].sin)->sin6_scope_id = ((struct sockaddr_in6*)&addr)->sin6_scope_id;
D1169 1
D1176 1
I1176 6
		ind = -1;
		if (addr.ss_family == AF_INET)
			ind = wildipv4;
		else if (addr.ss_family == AF_INET6)
			ind = wildipv6;
\
D1181 2
I1182 2
			 "...multicast address %s using wildcard socket",
			 stoa(&addr));
D1199 1
I1199 1
	    "Cannot add multicast address %s: no Multicast support",

mayer at pogo.udel.edu|ntpd/ntp_io.c|20050421032443|29206
D 1.180 05/06/25 22:12:38-04:00 mayer at pogo.udel.edu +162 -34
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fixes for IPv6 multicast at least for FreeBSD
K 22673
O -rw-rw-r--
P ntpd/ntp_io.c
------------------------------------------------

I48 1
\
D155 1
I155 1
static	isc_boolean_t	socket_multicast_enable	 P((struct interface *, int, int, struct sockaddr_storage *));
I158 4
#ifdef DEBUG
static void print_interface	P((int));
#endif
\
I189 2
int	findlocalcastinterface	P((struct sockaddr_storage *, int));
\
I330 21
\
static void
print_interface(int ind) {
	printf("interface %d:  fd=%d,  bfd=%d,  name=%.8s,  flags=0x%x,  scope=%d\n",
	       ind,
	       inter_list[ind].fd,
	       inter_list[ind].bfd,
	       inter_list[ind].name,
	       inter_list[ind].flags,
	       inter_list[ind].scopeid);
	/* Leave these as three printf calls. */
	printf("              sin=%s", stoa((&inter_list[ind].sin)));
	if (inter_list[ind].flags & INT_BROADCAST)
	    printf("  bcast=%s", stoa((&inter_list[ind].bcast)));
	/* Only IPv4 has a network mask */
	if(inter_list[ind].family == AF_INET)
		printf(",  mask=%s", stoa((&inter_list[ind].mask)));
	printf("\n");
	if (debug > 4)	/* in-depth debugging only */
		interface_dump(&inter_list[ind]);
}
I384 1
		((struct sockaddr_in6*)&inter_list[idx].sin)->sin6_scope_id = 0;
I447 1
	itf->family = isc_if->af;
I498 2
		/* Copy the scopeid and the interface index */
		itf->ifindex = isc_if->ifindex;
D513 3
D671 17
I687 1
			print_interface(i);
D853 1
I853 1
socket_multicast_enable(struct interface *iface, int ind, int lscope, struct sockaddr_storage *maddr)
D903 1
I903 1
#ifdef ISC_PLATFORM_HAVESCOPEID
D905 1
I905 1
			mreq6.ipv6mr_interface = lscope;
D908 1
I908 1
			mreq6.ipv6mr_interface = lscope;
I1043 1
		inter_list[i].family = AF_INET;
I1111 2
	int lif = 0;
	int lscope = 0;
I1126 1
#ifndef MULTICAST_NONEWSOCKET
I1158 2
	inter_list[ind].family = addr.ss_family;
\
I1172 1
#ifdef ISC_PLATFORM_HAVESCOPEID
I1173 1
#endif
I1175 7
		lif = findlocalcastinterface(&addr, INT_MULTICAST);
		lscope = ((struct sockaddr_in6*)&inter_list[lif].sin)->sin6_scope_id;
#ifdef DEBUG
	if (debug > 1)
		printf("Found interface index %d, scope: %d for address %s\n",
			lif, lscope, stoa(&addr));
#endif
D1178 1
I1178 1
\
I1190 1
		print_interface(ind);
D1215 1
I1215 15
#else
	ind = findlocalinterface(&addr);
#endif
	/*
	 * If we don't have a valid socket, just return
	 */
	if (ind < 0)
	{
		netsyslog(LOG_ERR,
		"Cannot add multicast address %s: Cannot find slot",
		stoa(&addr));
		return;
	}
\
	jstatus = socket_multicast_enable(&inter_list[ind], ind, lscope, &addr);
D1219 1
I1219 6
	{
		if (jstatus == ISC_TRUE)
			printf("io_multicast_add: %s on interface %d\n", stoa(&addr), ind);
		else
			printf("io_multicast_add: Failed to add %s on interface %d\n", stoa(&addr), ind);
	}
I1419 1
#ifdef ISC_PLATFORM_HAVEIPV6
D1422 1
I1422 1
                                "bind() fd %d, family %d, port %d, scope %d, addr %s, in6_is_addr_multicast=%d flags=%d fails: %%m",
D1424 1
I1424 1
                                ((struct sockaddr_in6*)addr)->sin6_scope_id, stoa(addr),
I1425 1
#endif
D2258 1
I2258 1
 * findlocalinterface - find local interface index corresponding to address
D2284 1
I2284 1
	if(addr->ss_family == AF_INET) {
D2286 1
I2286 4
		((struct sockaddr_in*)&saddr)->sin_port = htons(2000);
	}
#ifdef ISC_PLATFORM_HAVEIPV6
	else if(addr->ss_family == AF_INET6) {
D2288 1
I2288 4
		((struct sockaddr_in6*)&saddr)->sin6_port = htons(2000);
		((struct sockaddr_in6*)&saddr)->sin6_scope_id = ((struct sockaddr_in6*)addr)->sin6_scope_id;
	}
#endif
I2337 72
}
\
/*
 * findlocalcastinterface - find local *cast interface index corresponding to address
 * depending on the flags passed
 */
int
findlocalcastinterface(
	struct sockaddr_storage *addr, int flags
	)
{
	int i;
	int nif = -1;
\
	isc_boolean_t want_linklocal = ISC_FALSE; 
#if defined(ISC_PLATFORM_HAVEIPV6) && defined(IPV6_JOIN_GROUP) && defined(IPV6_LEAVE_GROUP)
	if (addr_ismulticast(addr) && flags == INT_MULTICAST)
	{
		if (IN6_IS_ADDR_MC_LINKLOCAL(&((struct sockaddr_in6*)addr)->sin6_addr))
		{
			want_linklocal = ISC_TRUE;
		}
		else if (IN6_IS_ADDR_MC_SITELOCAL(&((struct sockaddr_in6*)addr)->sin6_addr))
		{
			want_linklocal = ISC_TRUE;
		}
	}
#endif
\
\
	for (i = nwilds; i < ninterfaces; i++) {
		/* use only allowed addresses */
		if (inter_list[i].ignore_packets == ISC_TRUE)
			continue;
\
		/* Skip the loopback addresses */
		if (inter_list[i].flags & INT_LOOPBACK)
			continue;
\
		/* Skip if different family */
		if(inter_list[i].family != addr->ss_family)
			continue;
\
		/* Is this it one of these based on flags? */
		if (!(inter_list[i].flags & flags))
			continue;
\
		/* for IPv6 multicast check the address for linklocal */
#if defined(ISC_PLATFORM_HAVEIPV6) && defined(IPV6_JOIN_GROUP) && defined(IPV6_LEAVE_GROUP)
		if (flags == INT_MULTICAST &&
		   (IN6_IS_ADDR_LINKLOCAL(&((struct sockaddr_in6*)&inter_list[i].sin)->sin6_addr))
		   && want_linklocal == ISC_TRUE)
		{
			nif = i;
			break;
		}
		/* If we want a linklocal address and this isn't it, skip */\
		if (want_linklocal == ISC_TRUE)
			continue;
#endif
		/* Otherwise just look for the flag */
		if((inter_list[i].flags & flags))
		{
			nif = i;
			break;
		}
	}
#ifdef DEBUG
	if (debug > 1)
		printf("findlocalcastinterface: found index = %d\n", nif);
#endif
	return (nif);

== ntpd/ntpd.c ==
stenn at whimsy.udel.edu|ntpd/ntpd.c|19990526004817|01635|3aed0663
mayer at pogo.udel.edu|ntpd/ntpd.c|20050302195315|36391
D 1.67 05/04/16 23:22:57-04:00 mayer at tecotoo. +0 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Martin Burnicki's changes to remove unnecessary log.h include
K 34167
O -rw-rw-r--
P ntpd/ntpd.c
------------------------------------------------

D46 1

mayer at tecotoo.|ntpd/ntpd.c|20050417032257|34167
D 1.68 05/06/25 22:13:58-04:00 mayer at pogo.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Auto merged
i stenn at whimsy.udel.edu|ntpd/ntpd.c|20050427080912|05402
K 3178
M stenn at whimsy.udel.edu|ntpd/ntpd.c|20050427080912|05402
O -rw-rw-r--
P ntpd/ntpd.c
------------------------------------------------


== ports/winnt/include/config.h ==
stenn at whimsy.udel.edu|ports/winnt/include/config.h|19990728020335|01289|29080509
martin at pc-martin4.|ports/winnt/include/config.h|20050530111751|52366
D 1.38 05/06/26 12:33:08-04:00 mayer at pogo.udel.edu +5 -3
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Added MULTICAST_NONEWSOCKET to configuration, Windows doesn't allow separate socket for multicast
K 58829
O -rw-rw-r--
P ports/winnt/include/config.h
------------------------------------------------

D100 2
I101 4
# define MCAST				/* Enable Multicast Support */
# define MULTICAST_NONEWSOCKET		/* Don't create a new socket for mcast address */
\
# define REFCLOCK			/* from ntpd.mak */
D110 1
I110 1
# define CLOCK_PALISADE		/* from ntpd.mak */

== ports/winnt/instsrv/Instsrv.dsp ==
stenn at whimsy.udel.edu|ports/winnt/instsrv/Instsrv.dsp|19990728020408|01289|29080509
mayer at tecotoo.myibg.com|ports/winnt/instsrv/Instsrv.dsp|20020324021020|54975
D 1.6 05/04/16 23:25:00-04:00 mayer at tecotoo. +1 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Miscellaneous cleanup
K 55872
O -rw-rw-r--
P ports/winnt/instsrv/Instsrv.dsp
------------------------------------------------

D45 1
I45 1
# ADD CPP /nologo /MT /W4 /GX /O2 /I "..\..\..\include" /I "..\include" /I "." /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /YX"windows.h" /FD /c

== ports/winnt/libntp/libntp.dsp ==
stenn at whimsy.udel.edu|ports/winnt/libntp/libntp.dsp|19990728020416|01289|29080509
mayer at tecotoo.|ports/winnt/libntp/libntp.dsp|20041224033834|51733
D 1.25 05/04/16 23:24:18-04:00 mayer at tecotoo. +0 -8
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Remove references to log.c and log.h
K 43298
O -rw-rw-r--
P ports/winnt/libntp/libntp.dsp
------------------------------------------------

D249 4
D486 4

== BitKeeper/deleted/.del-log.h~29080509 ==
stenn at whimsy.udel.edu|ports/winnt/libntp/log.h|19990728020416|01289|29080509
mayer at tecotoo.myibg.com|ports/winnt/libntp/log.h|20020324021025|46531
D 1.5 05/04/16 23:12:02-04:00 mayer at tecotoo. +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Delete: ports/winnt/libntp/log.h
K 29949
O -rw-rw-r--
P BitKeeper/deleted/.del-log.h~29080509
------------------------------------------------


== ports/winnt/ntpd/nt_clockstuff.c ==
stenn at whimsy.udel.edu|ports/winnt/ntpd/nt_clockstuff.c|19991016040804|07763|8b711e53
mayer at tecotoo.|ports/winnt/ntpd/nt_clockstuff.c|20041110030216|04868
D 1.17 05/04/16 23:20:47-04:00 mayer at tecotoo. +0 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Martin Burnicki's changes to remove unnecessary registry call
K 64732
O -rw-rw-r--
P ports/winnt/ntpd/nt_clockstuff.c
------------------------------------------------

D52 1
D168 1

# Patch checksum=d713eaee


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