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

[Harlan Stenn]

#### ChangeSet ####
2006-08-08 22:38:19-04:00, mayer at pogo.udel.edu 
  bug #671: setsockopt needs macro for Windows

==== ntpd/ntp_io.c ====
2006-08-08 22:37:40-04:00, mayer at pogo.udel.edu +11 -6
  bug #671: setsockopt needs macro for Windows

--- 1.235/ntpd/ntp_io.c	2006-08-09 02:01:27 -04:00
+++ 1.236/ntpd/ntp_io.c	2006-08-09 02:01:27 -04:00
@@ -39,6 +39,15 @@
 # include <sys/sockio.h>
 #endif
 
+/*
+ * setsockopt does not always have the same arg declaration
+ * across all platforms. If it's not defined we make it empty
+ */
+
+#ifndef SETSOCKOPT_ARG_CAST
+#define SETSOCKOPT_ARG_CAST
+#endif
+
 /* 
  * Set up some macros to look for IPv6 and IPv6 multicast
  */
@@ -1556,7 +1565,7 @@ enable_multicast_if(struct interface *if
 		 * Don't send back to itself, but allow it to fail to set it
 		 */
 		if (setsockopt(iface->fd, IPPROTO_IP, IP_MULTICAST_LOOP,
-		       &off, sizeof(off)) == -1) {
+		       SETSOCKOPT_ARG_CAST &off, sizeof(off)) == -1) {
 			netsyslog(LOG_ERR,
 			"setsockopt IP_MULTICAST_LOOP failure: %m on socket %d, addr %s for multicast address %s",
 			iface->fd, stoa(&iface->sin), stoa(maddr));
@@ -2253,11 +2262,7 @@ open_socket(
 		/*
 		 * Don't log this under all conditions
 		 */
-		if (turn_off_reuse == 0
-#ifdef DEBUG
-		    || debug > 1
-#endif
-		   )
+		if (turn_off_reuse == 0 || debug > 1)
 			netsyslog(LOG_ERR, buff);
 
 		closesocket(fd);

==== ports/winnt/include/config.h ====
2006-08-08 22:37:40-04:00, mayer at pogo.udel.edu +1 -0
  bug #671: setsockopt needs macro for Windows

--- 1.41/ports/winnt/include/config.h	2006-08-09 02:01:28 -04:00
+++ 1.42/ports/winnt/include/config.h	2006-08-09 02:01:28 -04:00
@@ -67,6 +67,7 @@
 
 #define OPEN_BCAST_SOCKET	1 /* for	ntp_io.c */
 #define TYPEOF_IP_MULTICAST_LOOP BOOL												
+#define SETSOCKOPT_ARG_CAST (const char *)
 #define HAVE_RANDOM 
 #define MAXHOSTNAMELEN 64
 #define AUTOKEY

#### ChangeSet ####
2006-08-08 11:32:15-04:00, mayer at pogo.udel.edu 
  Bug #659: New include file for windows for handling file stat

==== ports/winnt/include/isc/stat.h ====
2006-08-08 11:31:23-04:00, mayer at pogo.udel.edu +66 -0
  BitKeeper file /pogo/users/mayer/ntp-dev/ports/winnt/include/isc/stat.h

--- /dev/null	2006-08-09 02:00:28 -04:00
+++ 1.1/ports/winnt/include/isc/stat.h	2006-08-09 02:01:28 -04:00
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* $Id: stat.h,v 1.3.2.2.2.1 2004/03/06 08:15:17 marka Exp $ */
+
+#ifndef ISC_STAT_H
+#define ISC_STAT_H 1
+
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <io.h>
+
+/* open() under unix allows setting of read/write permissions
+ * at the owner, group and other levels.  These don't exist in NT
+ * We'll just map them all to the NT equivalent 
+ */
+
+#define S_IREAD	_S_IREAD	/* read permission, owner */
+#define S_IWRITE _S_IWRITE	/* write permission, owner */
+#define S_IRUSR _S_IREAD	/* Owner read permission */
+#define S_IWUSR _S_IWRITE	/* Owner write permission */
+#define S_IRGRP _S_IREAD	/* Group read permission */
+#define S_IWGRP _S_IWRITE	/* Group write permission */
+#define S_IROTH _S_IREAD	/* Other read permission */
+#define S_IWOTH _S_IWRITE	/* Other write permission */
+
+#ifndef S_ISDIR
+# define S_ISDIR(m)	(((m) & S_IFMT) == S_IFDIR)
+#endif
+#ifndef S_ISREG
+# define S_ISREG(m)	(((m) & S_IFMT) == S_IFREG)
+#endif
+
+#define S_IFMT   _S_IFMT         /* file type mask */
+#define S_IFDIR  _S_IFDIR        /* directory */
+#define S_IFCHR  _S_IFCHR        /* character special */
+#define S_IFIFO  _S_IFIFO        /* pipe */
+#define S_IFREG  _S_IFREG        /* regular */
+#define S_IREAD  _S_IREAD        /* read permission, owner */
+#define S_IWRITE _S_IWRITE       /* write permission, owner */
+#define S_IEXEC  _S_IEXEC        /* execute/search permission, owner */
+
+#define O_RDONLY        _O_RDONLY
+#define O_WRONLY        _O_WRONLY
+#define O_RDWR          _O_RDWR
+#define O_APPEND        _O_APPEND
+#define O_CREAT         _O_CREAT
+#define O_TRUNC         _O_TRUNC
+#define O_EXCL          _O_EXCL
+
+
+#endif /* ISC_STAT_H */

==== ports/winnt/include/isc/stat.h ====
2006-08-08 11:31:23-04:00, mayer at pogo.udel.edu +0 -0