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

Harlan Stenn stenn at whimsy.udel.edu
Wed Jan 26 22:25:58 PST 2005


This BitKeeper patch contains the following changesets:
mayer at tecotoo.|ChangeSet|20050123193756|37361
mayer at tecotoo.|ChangeSet|20050123235435|37357

# 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.158/ntpd/ntp_io.c	2005-01-16 19:28:39 -05:00
#+++ 1.160/ntpd/ntp_io.c	2005-01-23 18:54:04 -05:00
#@@ -356,7 +356,7 @@
# 		inter_list[idx].received = 0;
# 		inter_list[idx].sent = 0;
# 		inter_list[idx].notsent = 0;
#-		inter_list[idx].flags = INT_BROADCAST;
#+		inter_list[idx].flags = INT_BROADCAST | INT_UP;
# 		any_interface = &inter_list[idx];
# #if defined(MCAST)
# 	/*
#@@ -386,7 +386,7 @@
# 		inter_list[idx].received = 0;
# 		inter_list[idx].sent = 0;
# 		inter_list[idx].notsent = 0;
#-		inter_list[idx].flags = 0;
#+		inter_list[idx].flags = INT_UP;
# 		any6_interface = &inter_list[idx];
# 		wildipv6 = idx;
# 		idx++;
#@@ -457,6 +457,10 @@
# 		       sizeof(struct in6_addr));
# 		((struct sockaddr_in6 *)&itf->sin)->sin6_port = port;
# 
#+#ifdef ISC_PLATFORM_HAVESCOPEID
#+		((struct sockaddr_in6 *)&itf->sin)->sin6_scope_id = isc_netaddr_getzone(&isc_if->address);
#+		itf->scopeid = isc_netaddr_getzone(&isc_if->address);
#+#endif
# 		itf->mask.ss_family = itf->sin.ss_family;
# 		memcpy(&(((struct sockaddr_in6 *)&itf->mask)->sin6_addr),
# 		       &(isc_if->netmask.type.in6),
#@@ -1395,7 +1399,7 @@
# 	FD_SET(fd, &activefds);
# #endif
# 	add_socket_to_list(fd);
#-	add_addr_to_list(addr, ind, flags);
#+	add_addr_to_list(addr, ind, interf->flags);
# 	/*
# 	 * set non-blocking,
# 	 */
#@@ -2167,12 +2171,6 @@
# 	if (rtn == SOCKET_ERROR)
# #endif
# 	{
#-#ifdef DEBUG
#-		if (debug > 2)
#-		{
#-			msyslog(LOG_ERR, "Failed to connect to remote address, error: %m");
#-		}
#-#endif
# 		closesocket(s);
# 		return ANY_INTERFACE_CHOOSE(addr);
# 	}
#

# Diff checksum=bd63cab2


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
mayer at tecotoo.|ChangeSet|20050118054854|37350
D 1.1316 05/01/23 14:37:56-05:00 mayer at tecotoo. +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Wasn't setting scopeid for IPv6 addresses
K 37361
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663 mayer at tecotoo.|ntpd/ntp_io.c|20050123193652|59533

mayer at tecotoo.|ChangeSet|20050123193756|37361
D 1.1317 05/01/23 18:54:35-05:00 mayer at tecotoo. +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Need reference to address for scope
K 37357
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663 mayer at tecotoo.|ntpd/ntp_io.c|20050123235404|59609

== ntpd/ntp_io.c ==
stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663
mayer at tecotoo.|ntpd/ntp_io.c|20050117002839|50280
D 1.159 05/01/23 14:36:52-05:00 mayer at tecotoo. +7 -9
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Wasn't setting scopeid for IPv6 addresses
K 59533
O -rw-rw-r--
P ntpd/ntp_io.c
------------------------------------------------

D359 1
I359 1
		inter_list[idx].flags = INT_BROADCAST | INT_UP;
D389 1
I389 1
		inter_list[idx].flags = INT_UP;
I459 4
#ifdef ISC_PLATFORM_HAVESCOPEID
		((struct sockaddr_in6 *)&itf->sin)->sin6_scope_id = isc_netaddr_getzone(isc_if->address);
		itf->scopeid = isc_netaddr_getzone(isc_if->address);
#endif
D1398 1
I1398 1
	add_addr_to_list(addr, ind, interf->flags);
D2170 6

mayer at tecotoo.|ntpd/ntp_io.c|20050123193652|59533
D 1.160 05/01/23 18:54:04-05:00 mayer at tecotoo. +2 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Need reference to address for scope
K 59609
O -rw-rw-r--
P ntpd/ntp_io.c
------------------------------------------------

D461 2
I462 2
		((struct sockaddr_in6 *)&itf->sin)->sin6_scope_id = isc_netaddr_getzone(&isc_if->address);
		itf->scopeid = isc_netaddr_getzone(&isc_if->address);

# Patch checksum=d55f7d5a


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