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

[Harlan Stenn]

#### ChangeSet ####
2006-08-01 18:03:38+00:00, kardel at pogo.udel.edu 
  ntp_io.c:
    Bug 678:
    make size of control message buffer configurable if
    needbe. use lower default of 1536 bytes as qnx couldn't
    cope with 5120 bytes and we are not really expecting
    long control messages.
    qnx limit is around 1900 bytes - qnx analysed by
    Michael Tatarinov - thanks

==== ntpd/ntp_io.c ====
2006-08-01 17:59:17+00:00, kardel at pogo.udel.edu +4 -1
  Bug 678:
  make size of control message buffer configurable if
  needbe. use lower default of 1536 bytes as qnx couldn't
  cope with 5120 bytes and we are not really expecting
  long control messages.
  qnx limit is around 1900 bytes - qnx analysed by
  Michael Tatarinov - thanks

--- 1.233/ntpd/ntp_io.c	2006-08-02 18:45:30 -04:00
+++ 1.234/ntpd/ntp_io.c	2006-08-02 18:45:30 -04:00
@@ -60,6 +60,9 @@ extern const char *specific_interface;
 #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 @@ read_network_packet(SOCKET fd, struct in
 #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
 
 	/*

#### ChangeSet ####
2006-08-01 06:41:31+00:00, kardel at pogo.udel.edu 
  ntp_io.c:
    Bug 676:
    Correct name buffer size calculation. Found
    by Michael Tatarinov - thanks!

==== ntpd/ntp_io.c ====
2006-08-01 06:40:29+00:00, kardel at pogo.udel.edu +1 -1
  Bug 676:
  Correct name buffer size calculation. Found
  by Michael Tatarinov - thanks!

--- 1.232/ntpd/ntp_io.c	2006-08-02 18:45:31 -04:00
+++ 1.233/ntpd/ntp_io.c	2006-08-02 18:45:31 -04:00
@@ -2751,7 +2751,7 @@ read_network_packet(SOCKET fd, struct in
 	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;