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

Harlan Stenn stenn at whimsy.udel.edu
Wed Aug 2 22:45:33 UTC 2006


This BitKeeper patch contains the following changesets:
kardel at pogo.udel.edu|ChangeSet|20060801064131|31868
kardel at pogo.udel.edu|ChangeSet|20060801180338|31865

# 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.232/ntpd/ntp_io.c	2006-08-02 18:45:32 -04:00
#+++ 1.234/ntpd/ntp_io.c	2006-08-02 18:45:32 -04:00
#@@ -60,6 +60,9 @@
# #if defined(CMSG_FIRSTHDR)
# #define HAVE_TIMESTAMP
# #define USE_TIMESTAMP_CMSG
#+#ifndef TIMESTAMP_CTLMSGBUF_SIZE
#+#define TIMESTAMP_CTLMSGBUF_SIZE 1536 /* moderate default */
#+#endif
# #else
# /* fill in for old/other timestamp interfaces */
# #endif
#@@ -2706,7 +2709,7 @@
# #ifdef HAVE_TIMESTAMP
# 	struct msghdr msghdr;
# 	struct iovec iovec;
#-	char control[5120];	/* pick up control messages */
#+	char control[TIMESTAMP_CTLMSGBUF_SIZE];	/* pick up control messages */
# #endif
# 
# 	/*
#@@ -2751,7 +2754,7 @@
# 	iovec.iov_base        = (void *)&rb->recv_space;
# 	iovec.iov_len         = sizeof(rb->recv_space);
# 	msghdr.msg_name       = (void *)&rb->recv_srcadr;
#-	msghdr.msg_namelen    = sizeof(rb->recv_space);
#+	msghdr.msg_namelen    = sizeof(rb->recv_srcadr);
# 	msghdr.msg_iov        = &iovec;
# 	msghdr.msg_iovlen     = 1;
# 	msghdr.msg_control    = (void *)&control;
#

# Diff checksum=607526cd


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20060729110256|31856
D 1.1447 06/08/01 06:41:31+00:00 kardel at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c ntp_io.c:
c   Bug 676:
c   Correct name buffer size calculation. Found
c   by Michael Tatarinov - thanks!
K 31868
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663 kardel at pogo.udel.edu|ntpd/ntp_io.c|20060801064029|43895

kardel at pogo.udel.edu|ChangeSet|20060801064131|31868
D 1.1448 06/08/01 18:03:38+00:00 kardel at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c ntp_io.c:
c   Bug 678:
c   make size of control message buffer configurable if
c   needbe. use lower default of 1536 bytes as qnx couldn't
c   cope with 5120 bytes and we are not really expecting
c   long control messages.
c   qnx limit is around 1900 bytes - qnx analysed by
c   Michael Tatarinov - thanks
K 31865
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663 kardel at pogo.udel.edu|ntpd/ntp_io.c|20060801175917|53414

== ntpd/ntp_io.c ==
stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663
kardel at pogo.udel.edu|ntpd/ntp_io.c|20060722100832|43780
D 1.233 06/08/01 06:40:29+00:00 kardel at pogo.udel.edu +1 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug 676:
c Correct name buffer size calculation. Found
c by Michael Tatarinov - thanks!
K 43895
O -rw-rw-r--
P ntpd/ntp_io.c
------------------------------------------------

D2754 1
I2754 1
	msghdr.msg_namelen    = sizeof(rb->recv_srcadr);

kardel at pogo.udel.edu|ntpd/ntp_io.c|20060801064029|43895
D 1.234 06/08/01 17:59:17+00:00 kardel at pogo.udel.edu +4 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug 678:
c make size of control message buffer configurable if
c needbe. use lower default of 1536 bytes as qnx couldn't
c cope with 5120 bytes and we are not really expecting
c long control messages.
c qnx limit is around 1900 bytes - qnx analysed by
c Michael Tatarinov - thanks
K 53414
O -rw-rw-r--
P ntpd/ntp_io.c
------------------------------------------------

I62 3
#ifndef TIMESTAMP_CTLMSGBUF_SIZE
#define TIMESTAMP_CTLMSGBUF_SIZE 1536 /* moderate default */
#endif
D2709 1
I2709 1
	char control[TIMESTAMP_CTLMSGBUF_SIZE];	/* pick up control messages */

# Patch checksum=6bb6067c


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