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

Harlan Stenn stenn at whimsy.udel.edu
Fri Jan 2 13:37:04 PST 2004


This BitKeeper patch contains the following changesets:
mayer at pogo.udel.edu|ChangeSet|20031231184443|16531
stenn at whimsy.udel.edu|ChangeSet|20040102213550|25571

# 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.14/libisc/ifiter_ioctl.c	Sat Dec 13 20:28:38 2003
#+++ 1.15/libisc/ifiter_ioctl.c	Wed Dec 31 13:43:31 2003
#@@ -670,10 +670,9 @@
# 	if ((lifreq.lifr_flags & IFF_LOOPBACK) != 0)
# 		iter->current.flags |= INTERFACE_F_LOOPBACK;
# 
#-	/* 
#-	 * Note that IPv6 broadcast does not exist
#-	 * so don't check for IPv6 broadcast flag
#-	 */
#+	if ((lifreq.lifr_flags & IFF_BROADCAST) != 0) {
#+		iter->current.flags |= INTERFACE_F_BROADCAST;
#+	}
# 
# #ifdef IFF_MULTICAST
# 	if ((lifreq.lifr_flags & IFF_MULTICAST) != 0) {
#
#--- 1.104/ntpd/ntp_io.c	Tue Dec 16 16:21:57 2003
#+++ 1.105/ntpd/ntp_io.c	Wed Dec 31 13:41:54 2003
#@@ -580,11 +580,12 @@
# void
# io_setbclient(void)
# {
#+#ifdef OPEN_BCAST_SOCKET 
# 	int i;
#+	int nif = 0;
# 
#-#ifdef OPEN_BCAST_SOCKET
# 	set_reuseaddr(1);
#-#endif
#+
# 	for (i = nwilds; i < ninterfaces; i++) {
# 		/* Only IPv4 addresses are valid for broadcast */
# 		if (inter_list[i].bcast.ss_family != AF_INET)
#@@ -598,14 +599,11 @@
# 		if (inter_list[i].flags & INT_BCASTOPEN)
# 			continue;
# 
#-#ifdef	SYS_SOLARIS
#-		inter_list[i].bcast.sin_addr.s_addr = htonl(INADDR_ANY);
#-#endif
#-#ifdef OPEN_BCAST_SOCKET /* Was: !SYS_DOMAINOS && !SYS_LINUX */
# 		inter_list[i].bfd = open_socket(&inter_list[i].bcast,
# 		    INT_BROADCAST, 1);
# 		if (inter_list[i].bfd != INVALID_SOCKET) {
# 			inter_list[i].flags |= INT_BCASTOPEN;
#+			nif++;
# #if defined (HAVE_IO_COMPLETION_PORT)
# 			io_completion_port_add_socket(inter_list[i].bfd, &inter_list[i]);
# #endif
#@@ -620,14 +618,17 @@
# 				i);
# 		}
# #endif
#-#endif
# 	}
#-#ifdef OPEN_BCAST_SOCKET
# 	set_reuseaddr(0);
#-#endif
# #ifdef DEBUG
# 	if (debug)
#-		printf("io_setbclient: Opened broadcast clients\n");
#+		if (nif > 0)
#+			printf("io_setbclient: Opened broadcast clients\n");
#+#endif
#+		if (nif == 0)
#+			netsyslog(LOG_ERR, "Unable to listen for broadcasts, no broadcast interfaces available");
#+#else
#+	netsyslog(LOG_ERR, "io_setbclient: Broadcast Client disabled by build");
# #endif
# }
# 
#

# Diff checksum=d5fb40a0


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20031216212211|17218
D 1.1191.1.1 03/12/31 13:44:43-05:00 mayer at pogo.udel.edu +2 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fix Broadcast support for those systems that support IPv6
K 16531
P ChangeSet
------------------------------------------------

0a0
> mayer at tecotoo.myibg.com|libisc/ifiter_ioctl.c|20030105020047|16979|d0eb782d mayer at pogo.udel.edu|libisc/ifiter_ioctl.c|20031231184331|51344
> stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663 mayer at pogo.udel.edu|ntpd/ntp_io.c|20031231184154|35134

stenn at whimsy.udel.edu|ChangeSet|20040102210153|26258
D 1.1204 04/01/02 16:35:50-05: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-io into whimsy.udel.edu:/backroom/ntp-dev
i mayer at pogo.udel.edu|ChangeSet|20031231184443|16531
K 25571
M mayer at pogo.udel.edu|ChangeSet|20031231184443|16531
P ChangeSet
------------------------------------------------


== libisc/ifiter_ioctl.c ==
mayer at tecotoo.myibg.com|libisc/ifiter_ioctl.c|20030105020047|16979|d0eb782d
mayer at tecotoo.myibg.com|libisc/ifiter_ioctl.c|20031214012838|51382
D 1.15 03/12/31 13:43:31-05:00 mayer at pogo.udel.edu +3 -4
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fix Broadcast support for IPv6 capable queries to ioctl
K 51344
O -rw-rw-r--
P libisc/ifiter_ioctl.c
------------------------------------------------

D673 4
I676 3
	if ((lifreq.lifr_flags & IFF_BROADCAST) != 0) {
		iter->current.flags |= INTERFACE_F_BROADCAST;
	}

== ntpd/ntp_io.c ==
stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663
stenn at whimsy.udel.edu|ntpd/ntp_io.c|20031216212157|31317
D 1.105 03/12/31 13:41:54-05:00 mayer at pogo.udel.edu +11 -10
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fix io_setbclient to properly use MACROS and add proper error information
K 35134
O -rw-rw-r--
P ntpd/ntp_io.c
------------------------------------------------

I582 1
#ifdef OPEN_BCAST_SOCKET 
I583 1
	int nif = 0;
D585 1
D587 1
I587 1
\
D601 4
I608 1
			nif++;
D623 1
D625 1
D627 1
D630 1
I630 7
		if (nif > 0)
			printf("io_setbclient: Opened broadcast clients\n");
#endif
		if (nif == 0)
			netsyslog(LOG_ERR, "Unable to listen for broadcasts, no broadcast interfaces available");
#else
	netsyslog(LOG_ERR, "io_setbclient: Broadcast Client disabled by build");

# Patch checksum=e1e0f719



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