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

Harlan Stenn stenn at whimsy.udel.edu
Tue May 9 07:27:24 UTC 2006


This BitKeeper patch contains the following changesets:
kardel at pogo.udel.edu|ChangeSet|20060509071214|58416
stenn at whimsy.udel.edu|ChangeSet|20060509072447|58413

# 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:	/deacon/backroom/ntp-dev

#
#--- 1.82/ntpd/ntpd.c	2006-05-05 08:00:45 -04:00
#+++ 1.83/ntpd/ntpd.c	2006-05-09 03:11:09 -04:00
#@@ -968,10 +968,9 @@
# 			 * Call the data procedure to handle each received
# 			 * packet.
# 			 */
#-			if (rbuf != NULL)	/* This should always be true */
#+			if (rbuf->receiver != NULL)	/* This should always be true */
# 			{
# 				(rbuf->receiver)(rbuf);
#-				freerecvbuf(rbuf);
# 			} else {
# 				 msyslog(LOG_ERR, "receive buffer corruption - receiver found to be NULL - ABORTING");
# 				 abort();
#@@ -979,6 +978,7 @@
# # ifdef HAVE_SIGNALED_IO
#                         block_io_and_alarm();
# # endif /* HAVE_SIGNALED_IO */
#+			freerecvbuf(rbuf);
# 		}
# 
# 		/*
#

# Diff checksum=e8d7b06f


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20060508222144|58324
D 1.1505 06/05/09 07:12:14+00:00 kardel at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c ntpd.c:
c   move freerecvbuf() into block io section
c   test receiver instead of just the rbuf pointer
K 58416
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntpd.c|19990526004817|01635|3aed0663 kardel at pogo.udel.edu|ntpd/ntpd.c|20060509071109|07322

kardel at pogo.udel.edu|ChangeSet|20060509071214|58416
D 1.1506 06/05/09 03:24: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/kardel/main-line/ntp-dev
c into  whimsy.udel.edu:/deacon/backroom/ntp-dev
i stenn at whimsy.udel.edu|ChangeSet|20060509072202|58321
K 58413
M stenn at whimsy.udel.edu|ChangeSet|20060509072202|58321
P ChangeSet
------------------------------------------------


== ntpd/ntpd.c ==
stenn at whimsy.udel.edu|ntpd/ntpd.c|19990526004817|01635|3aed0663
mayer at pogo.udel.edu|ntpd/ntpd.c|20060505120045|06371
D 1.83 06/05/09 07:11:09+00:00 kardel at pogo.udel.edu +2 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c move freerecvbuf() into block io section
c test receiver instead of just the rbuf pointer
K 7322
O -rw-rw-r--
P ntpd/ntpd.c
------------------------------------------------

D971 1
I971 1
			if (rbuf->receiver != NULL)	/* This should always be true */
D974 1
I981 1
			freerecvbuf(rbuf);

# Patch checksum=7a2fe07d


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