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

Harlan Stenn stenn at mail.eecis.udel.edu
Wed Nov 9 23:36:53 PST 2005


This BitKeeper patch contains the following changesets:
mayer at pogo.udel.edu|ChangeSet|20051109204956|20340
mayer at pogo.udel.edu|ChangeSet|20051108141535|20976

# 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.191/ntpd/ntp_io.c	2005-09-25 04:17:25 -04:00
#+++ 1.192/ntpd/ntp_io.c	2005-11-08 09:15:02 -05:00
#@@ -936,13 +936,13 @@
# 	struct in6_addr iaddr6;
# #endif /* INCLUDE_IPV6_MULTICAST_SUPPORT */
# 	struct ip_mreq mreq;
#-	memset((char *)&mreq, 0, sizeof(mreq));
# 
# 	switch (maddr->ss_family)
# 	{
# 	case AF_INET:
#+		memset((char *)&mreq, 0, sizeof(mreq));
# 		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);
# 		if (setsockopt(iface->fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
# 			(char *)&mreq, sizeof(mreq)) == -1) {
# 			netsyslog(LOG_ERR,
#@@ -971,6 +971,7 @@
# 		 * from the scope id. Don't do this for other types of multicast
# 		 * addresses. For now let the kernel figure it out.
# 		 */
#+		memset((char *)&mreq6, 0, sizeof(mreq6));
# 		iaddr6 = ((struct sockaddr_in6*)maddr)->sin6_addr;
# 		mreq6.ipv6mr_multiaddr = iaddr6;
# 		mreq6.ipv6mr_interface = lscope;
#@@ -1253,9 +1254,12 @@
# 		break;
# 	}
# 
#+	set_reuseaddr(1);
# 	inter_list[ind].bfd = INVALID_SOCKET;
# 	inter_list[ind].fd = open_socket(&inter_list[ind].sin,
# 			    INT_MULTICAST, 1, &inter_list[ind], ind);
#+	set_reuseaddr(0);
#+
# 	if (inter_list[ind].fd != INVALID_SOCKET)
# 	{
# 		inter_list[ind].bfd = INVALID_SOCKET;
#

# Diff checksum=b9ce9060


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
mayer at pogo.udel.edu|ChangeSet|20051106221515|21190
D 1.1432.1.1 05/11/08 09:15:35-05:00 mayer at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c bug 495 - fix for multicasting and reuseaddr got lost
K 20976
P ChangeSet
------------------------------------------------

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

stenn at deacon.udel.edu|ChangeSet|20051109053254|20554
D 1.1436 05/11/09 15:49:56-05: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 mayer at pogo.udel.edu|ChangeSet|20051108141535|20976
K 20340
M mayer at pogo.udel.edu|ChangeSet|20051108141535|20976
P ChangeSet
------------------------------------------------


== ntpd/ntp_io.c ==
stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663
stenn at deacon.udel.edu|ntpd/ntp_io.c|20050925081725|29426
D 1.192 05/11/08 09:15:02-05:00 mayer at pogo.udel.edu +6 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c bug 495 - fix for multicasting and reuseaddr got lost
K 32713
O -rw-rw-r--
P ntpd/ntp_io.c
------------------------------------------------

D939 1
I943 1
		memset((char *)&mreq, 0, sizeof(mreq));
D945 1
I945 1
		mreq.imr_interface.s_addr = htonl(INADDR_ANY);
I973 1
		memset((char *)&mreq6, 0, sizeof(mreq6));
I1255 1
	set_reuseaddr(1);
I1258 2
	set_reuseaddr(0);
\

# Patch checksum=7354e271


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