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

Harlan Stenn stenn at whimsy.udel.edu
Fri May 26 06:38:29 UTC 2006


This BitKeeper patch contains the following changesets:
kardel at pogo.udel.edu|ChangeSet|20060525180849|58679
kardel at pogo.udel.edu|ChangeSet|20060525182523|58686
stenn at pogo.udel.edu|ChangeSet|20060526061542|58606

# 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.200/ntpd/ntp_io.c	2006-05-21 14:57:23 -04:00
#+++ 1.201/ntpd/ntp_io.c	2006-05-25 13:47:54 -04:00
#@@ -2744,6 +2744,7 @@
# 	struct refclockio *rio
# 	)
# {
#+	BLOCKIO();
# 	/*
# 	 * Remove structure from the list
# 	 */
#@@ -2770,6 +2771,7 @@
# 	 * Close the descriptor.
# 	 */
# 	close_file(rio->fd);
#+	UNBLOCKIO();
# }
# #endif	/* REFCLOCK */
# 
#@@ -2787,6 +2789,7 @@
# 	BLOCKIO();
# 	for (i = startfd; i <= maxactivefd; i++)
# 	    (void)close_socket(i);
#+	UNBLOCKIO();
# }
# #else
# /*
#@@ -2808,6 +2811,7 @@
# 		close_socket(lsock->fd);
# 		lsock = next;
# 	}
#+	UNBLOCKIO();
# 
# }
# #endif
#
#--- 1.42.1.1/ntpd/refclock_parse.c	2006-05-12 12:28:09 -04:00
#+++ 1.45/ntpd/refclock_parse.c	2006-05-26 02:15:37 -04:00
#@@ -1,7 +1,7 @@
# /*
#- * /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.68 2006/05/01 17:02:51 kardel RELEASE_20060501_A
#+ * /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.70 2006/05/25 18:20:50 kardel RELEASE_20060525_C
#  *
#- * refclock_parse.c,v 4.68 2006/05/01 17:02:51 kardel RELEASE_20060501_A
#+ * refclock_parse.c,v 4.70 2006/05/25 18:20:50 kardel RELEASE_20060525_C
#  *
#  * generic reference clock driver for several DCF/GPS/MSF/... receivers
#  *
#@@ -9,7 +9,7 @@
#  * available and configured. Currently the STREAMS module
#  * is only available for Suns running SunOS 4.x and SunOS5.x
#  *
#- * Copyright (c) 1995-2005 by Frank Kardel <kardel <AT> ntp.org>
#+ * Copyright (c) 1995-2006 by Frank Kardel <kardel <AT> ntp.org>
#  * Copyright (c) 1989-1994 by Frank Kardel, Friedrich-Alexander Universität Erlangen-Nürnberg, Germany
#  *
#  * Redistribution and use in source and binary forms, with or without
#@@ -182,7 +182,7 @@
# #include "ieee754io.h"
# #include "recvbuff.h"
# 
#-static char rcsid[] = "refclock_parse.c,v 4.68 2006/05/01 17:02:51 kardel RELEASE_20060501_A";
#+static char rcsid[] = "refclock_parse.c,v 4.70 2006/05/25 18:20:50 kardel RELEASE_20060525_C";
# 
# /**===========================================================================
#  ** external interface to ntp mechanism
#@@ -2601,14 +2601,14 @@
# 		parse->parse_type->cl_end(parse);
# 	}
# 	
#-	if (parse->binding)
#-	    PARSE_END(parse);
#-
# 	/*
# 	 * Tell the I/O module to turn us off.  We're history.
# 	 */
# 	io_closeclock(&parse->generic->io);
# 
#+	if (parse->binding)
#+	    PARSE_END(parse);
#+
# 	free_varlist(parse->kv);
#   
# 	NLOG(NLOG_CLOCKINFO) /* conditional if clause for conditional syslog */
#@@ -2994,19 +2994,11 @@
# 	}
# 
# 	/*
#-	 * Insert in async io device list.
#+	 * pick correct input machine
# 	 */
# 	parse->generic->io.srcclock = (caddr_t)parse;
# 	parse->generic->io.datalen = 0;
# 	
#-	if (!io_addclock(&parse->generic->io))
#-        {
#-		msyslog(LOG_ERR,
#-			"PARSE receiver #%d: parse_start: addclock %s fails (ABORT - clock type requires async io)", CLK_UNIT(parse->peer), parsedev);
#-		parse_shutdown(CLK_UNIT(parse->peer), peer); /* let our cleaning staff do the work */
#-		return 0;
#-	}
#-
# 	parse->binding = init_iobinding(parse);
# 
# 	if (parse->binding == (bind_t *)0)
#@@ -3020,6 +3012,17 @@
# 	parse->generic->io.io_input   = parse->binding->bd_io_input; /* pick correct input routine */
# 
# 	/*
#+	 * Insert in async io device list.
#+	 */
#+	if (!io_addclock(&parse->generic->io))
#+        {
#+		msyslog(LOG_ERR,
#+			"PARSE receiver #%d: parse_start: addclock %s fails (ABORT - clock type requires async io)", CLK_UNIT(parse->peer), parsedev);
#+		parse_shutdown(CLK_UNIT(parse->peer), peer); /* let our cleaning staff do the work */
#+		return 0;
#+	}
#+
#+	/*
# 	 * as we always(?) get 8 bit chars we want to be
# 	 * sure, that the upper bits are zero for less
# 	 * than 8 bit I/O - so we pass that information on.
#@@ -5678,6 +5681,15 @@
#  * History:
#  *
#  * refclock_parse.c,v
#+ * Revision 4.70  2006/05/25 18:20:50  kardel
#+ * bug #619
#+ * terminate parse io engine after de-registering
#+ * from refclock io engine
#+ *
#+ * Revision 4.69  2006/05/25 17:28:02  kardel
#+ * complete refclock io structure initialization *before* inserting it into the
#+ * refclock input machine (avoids null pointer deref) (bug #619)
#+ *
#  * Revision 4.68  2006/05/01 17:02:51  kardel
#  * copy receiver method also for newlwy created receive buffers
#  *
#

# Diff checksum=44a5c1d2


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20060525110250|58596
D 1.1522.1.2 06/05/25 18:08:49+00:00 kardel at pogo.udel.edu +2 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c ntp_io.c:
c   add missing BLOCKIO()/UNBLOCKIO() calls in refclock io
c   handling found during analysis for bug #619
c refclock_parse.c:
c   bug #619
c   complete refclock io structure initialization *before* inserting it into the
c   refclock input machine (avoids null pointer deref)
K 58679
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663 kardel at pogo.udel.edu|ntpd/ntp_io.c|20060525174754|23971
> stenn at whimsy.udel.edu|ntpd/refclock_parse.c|19990526004818|01635|3aed0663 kardel at pogo.udel.edu|ntpd/refclock_parse.c|20060525174426|26833

kardel at pogo.udel.edu|ChangeSet|20060525180849|58679
D 1.1522.1.3 06/05/25 18:25:23+00:00 kardel at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c refclock_parse.c:
c   bug #619
c   terminate parse io engine after de-registering
c   from refclock io engine
K 58686
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/refclock_parse.c|19990526004818|01635|3aed0663 kardel at pogo.udel.edu|ntpd/refclock_parse.c|20060525182449|37375

stenn at pogo.udel.edu|ChangeSet|20060526060323|58587
D 1.1525 06/05/26 02:15:42-04:00 stenn at pogo.udel.edu +1 -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/kardel/bugs/ntp-dev-619
i kardel at pogo.udel.edu|ChangeSet|20060525180849|58679
i kardel at pogo.udel.edu|ChangeSet|20060525182523|58686
K 58606
M kardel at pogo.udel.edu|ChangeSet|20060525182523|58686
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/refclock_parse.c|19990526004818|01635|3aed0663 stenn at pogo.udel.edu|ntpd/refclock_parse.c|20060526061537|37375

== 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|20060521185723|20786
D 1.201 06/05/25 17:47:54+00:00 kardel at pogo.udel.edu +4 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c add missing BLOCKIO()/UNBLOCKIO() calls in refclock io
c handling found during analysis for bug #619
K 23971
O -rw-rw-r--
P ntpd/ntp_io.c
------------------------------------------------

I2746 1
	BLOCKIO();
I2772 1
	UNBLOCKIO();
I2789 1
	UNBLOCKIO();
I2810 1
	UNBLOCKIO();

== ntpd/refclock_parse.c ==
stenn at whimsy.udel.edu|ntpd/refclock_parse.c|19990526004818|01635|3aed0663
kardel at pogo.udel.edu|ntpd/refclock_parse.c|20060512162809|07789
D 1.42.1.2 06/05/25 17:44:26+00:00 kardel at pogo.udel.edu +19 -12
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c bug #619
c complete refclock io structure initialization *before* inserting it into the
c refclock input machine (avoids null pointer deref)
K 26833
O -rw-rw-r--
P ntpd/refclock_parse.c
------------------------------------------------

D2 1
I2 1
 * /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.69 2006/05/25 17:28:02 kardel RELEASE_20060525_B
D4 1
I4 1
 * refclock_parse.c,v 4.69 2006/05/25 17:28:02 kardel RELEASE_20060525_B
D185 1
I185 1
static char rcsid[] = "refclock_parse.c,v 4.69 2006/05/25 17:28:02 kardel RELEASE_20060525_B";
D2997 1
I2997 1
	 * pick correct input machine
D3002 8
I3022 11
	 * Insert in async io device list.
	 */
	if (!io_addclock(&parse->generic->io))
        {
		msyslog(LOG_ERR,
			"PARSE receiver #%d: parse_start: addclock %s fails (ABORT - clock type requires async io)", CLK_UNIT(parse->peer), parsedev);
		parse_shutdown(CLK_UNIT(parse->peer), peer); /* let our cleaning staff do the work */
		return 0;
	}
\
	/*
I5680 4
 * Revision 4.69  2006/05/25 17:28:02  kardel
 * complete refclock io structure initialization *before* inserting it into the
 * refclock input machine (avoids null pointer deref) (bug #619)
 *

kardel at pogo.udel.edu|ntpd/refclock_parse.c|20060525174426|26833
D 1.42.1.3 06/05/25 18:24:49+00:00 kardel at pogo.udel.edu +12 -7
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c bug #619
c terminate parse io engine after de-registering
c from refclock io engine
K 37375
O -rw-rw-r--
P ntpd/refclock_parse.c
------------------------------------------------

D2 1
I2 1
 * /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.70 2006/05/25 18:20:50 kardel RELEASE_20060525_C
D4 1
I4 1
 * refclock_parse.c,v 4.70 2006/05/25 18:20:50 kardel RELEASE_20060525_C
D12 1
I12 1
 * Copyright (c) 1995-2006 by Frank Kardel <kardel <AT> ntp.org>
D185 1
I185 1
static char rcsid[] = "refclock_parse.c,v 4.70 2006/05/25 18:20:50 kardel RELEASE_20060525_C";
D2604 3
I2611 3
	if (parse->binding)
	    PARSE_END(parse);
\
I5683 5
 * Revision 4.70  2006/05/25 18:20:50  kardel
 * bug #619
 * terminate parse io engine after de-registering
 * from refclock io engine
 *

kardel at pogo.udel.edu|ntpd/refclock_parse.c|20060513062422|07789
D 1.45 06/05/26 02:15:37-04:00 stenn at pogo.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Auto merged
i kardel at pogo.udel.edu|ntpd/refclock_parse.c|20060525174426|26833
i kardel at pogo.udel.edu|ntpd/refclock_parse.c|20060525182449|37375
K 37375
M kardel at pogo.udel.edu|ntpd/refclock_parse.c|20060525182449|37375
O -rw-rw-r--
P ntpd/refclock_parse.c
------------------------------------------------


# Patch checksum=cfb37d9e


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