Windows port v2.6.5 6

clients/.gitignore

@@ -12,3 +12,4 @@ upsmon
 upsrw
 upssched
 .libs
+*.exe

clients/Makefile.am

@@ -19,8 +19,14 @@ endif
 
 bin_PROGRAMS = upsc upslog upsrw upscmd
 dist_bin_SCRIPTS = upssched-cmd
+if HAVE_WINDOWS_SOCKETS
+sbin_PROGRAMS = upsmon upssched message
+#TODO : port libnutclient
+lib_LTLIBRARIES = libupsclient.la
+else !HAVE_WINDOWS_SOCKETS
 sbin_PROGRAMS = upsmon upssched
 lib_LTLIBRARIES = libupsclient.la libnutclient.la
+endif !HAVE_WINDOWS_SOCKETS
 if WITH_DEV
  include_HEADERS = upsclient.h ../include/parseconf.h nutclient.h
 endif
@@ -33,6 +39,9 @@ upscmd_SOURCES = upscmd.c upsclient.h
 upsrw_SOURCES = upsrw.c upsclient.h
 upslog_SOURCES = upslog.c upsclient.h upslog.h
 upsmon_SOURCES = upsmon.c upsmon.h upsclient.h
+if HAVE_WINDOWS_SOCKETS
+message_SOURCES = message.c
+endif
 
 upssched_SOURCES = upssched.c upssched.h
 upssched_LDADD = ../common/libcommon.la ../common/libparseconf.la $(NETLIBS)
@@ -45,15 +54,21 @@ upsstats_cgi_SOURCES = upsstats.c upsclient.h status.h upsstats.h	\
  upsimagearg.h cgilib.c cgilib.h
 
 # not LDADD.
+
+# libupsclient version information
+# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+if HAVE_WINDOWS_SOCKETS
+libupsclient_la_SOURCES = upsclient.c upsclient.h ../common/wincompat.c ../common/common.c
+libupsclient_la_LIBADD = ../common/libparseconf.la -lws2_32
+libupsclient_la_LDFLAGS = -version-info 3:1:0 -no-undefined
+else !HAVE_WINDOWS_SOCKETS
 libupsclient_la_SOURCES = upsclient.c upsclient.h
 libupsclient_la_LIBADD = ../common/libparseconf.la
+libupsclient_la_LDFLAGS = -version-info 3:1:0
+endif !HAVE_WINDOWS_SOCKETS
+
 if WITH_SSL
   libupsclient_la_LIBADD += $(LIBSSL_LIBS)
 endif
 
-# libupsclient version information
-# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libupsclient_la_LDFLAGS = -version-info 3:1:0
-
 libnutclient_la_SOURCES = nutclient.h nutclient.cpp
-

clients/message.c

@@ -0,0 +1,10 @@
+#ifdef WIN32
+#include <windows.h>
+
+int main(int args,char ** argv)
+{
+	MessageBox(NULL,argv[1],"Network UPS Tools",MB_OK|MB_ICONEXCLAMATION|MB_SERVICE_NOTIFICATION);
+
+	return 0;
+}
+#endif

clients/nutclient.cpp

@@ -16,7 +16,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-
+#ifndef WIN32
 #include "nutclient.h"
 
 #include <sstream>
@@ -1723,4 +1723,4 @@ void nutclient_execute_device_command(NUTCLIENT_t client, const char* dev, const
 
 } /* extern "C" */
 
-
+#endif

clients/upsc.c

@@ -21,9 +21,11 @@
 #include "common.h"
 #include "nut_platform.h"
 
+#ifndef WIN32
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
+#endif
 
 #include "upsclient.h"
 

clients/upsclient.c

@@ -21,21 +21,36 @@
 
 #include "config.h"	/* safe because it doesn't contain prototypes */
 
+#ifndef WIN32
 #ifdef HAVE_PTHREAD
 /* this include is needed on AIX to have errno stored in thread local storage */
 #include <pthread.h>
 #endif 
+#endif
 
 #include <errno.h>
-#include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#ifndef WIN32
+#include <netdb.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
+#define SOCK_OPT_CAST 
+#else
+#define SOCK_OPT_CAST (char *)
+/* Those 2 files for support of getaddrinfo, getnameinfo and freeaddrinfo
+   on Windows 2000 and older versions */
+#include <ws2tcpip.h>
+#include <wspiapi.h>
+/* This override network system calls to adapt to Windows specificity */
+#define W32_NETWORK_CALL_OVERRIDE
+#include "wincompat.h"
+#undef W32_NETWORK_CALL_OVERRIDE
+#endif
 
 #include "upsclient.h"
 #include "common.h"
@@ -840,8 +855,16 @@ int upscli_tryconnect(UPSCONN_t *ups, const char *host, int port, int flags,stru
 	fd_set 			wfds;
 	int			error;
 	socklen_t		error_size;
+
+#ifndef WIN32
 	long			fd_flags;
+#else
+	HANDLE event = NULL;
+	unsigned long argp;
 
+	WSADATA WSAdata;
+	WSAStartup(2,&WSAdata);
+#endif
 	if (!ups) {
 		return -1;
 	}
@@ -900,7 +923,7 @@ int upscli_tryconnect(UPSCONN_t *ups, const char *host, int port, int flags,stru
 			{
 			case EAFNOSUPPORT:
 			case EINVAL:
-                                break;
+				break;
 			default:
 				ups->upserror = UPSCLI_ERR_SOCKFAILURE;
 				ups->syserrno = errno;
@@ -910,21 +933,38 @@ int upscli_tryconnect(UPSCONN_t *ups, const char *host, int port, int flags,stru
 
 		/* non blocking connect */
 		if(timeout != NULL) {
+#ifndef WIN32
 			fd_flags = fcntl(sock_fd, F_GETFL);
 			fd_flags |= O_NONBLOCK;
 			fcntl(sock_fd, F_SETFL, fd_flags);
 		}
 
+#else
+			event = CreateEvent(NULL, /* Security */
+					FALSE, /* auto-reset */
+					FALSE, /* initial state */
+					NULL); /* no name */
+
+		/* Associate socket event to the socket via its Event object */
+			WSAEventSelect( sock_fd, event, FD_CONNECT );
+			CloseHandle(event);
+		}
+#endif
+
 		while ((v = connect(sock_fd, ai->ai_addr, ai->ai_addrlen)) < 0) {
+#ifndef WIN32
 			if(errno == EINPROGRESS) {
+#else
+			if(errno == WSAEWOULDBLOCK) {
+#endif
 				FD_ZERO(&wfds);
 				FD_SET(sock_fd, &wfds);
 				select(sock_fd+1,NULL,&wfds,NULL,
 						timeout);
 				if (FD_ISSET(sock_fd, &wfds)) {
 					error_size = sizeof(error);
 					getsockopt(sock_fd,SOL_SOCKET,SO_ERROR,
-							&error,&error_size);
+							SOCK_OPT_CAST&error,&error_size);
 					if( error == 0) {
 						/* connect successful */
 						v = 0;
@@ -960,9 +1000,14 @@ int upscli_tryconnect(UPSCONN_t *ups, const char *host, int port, int flags,stru
 
 		/* switch back to blocking operation */
 		if(timeout != NULL) {
+#ifndef WIN32
 			fd_flags = fcntl(sock_fd, F_GETFL);
 			fd_flags &= ~O_NONBLOCK;
 			fcntl(sock_fd, F_SETFL, fd_flags);
+#else
+			argp = 0;
+			ioctlsocket(sock_fd,FIONBIO,&argp);
+#endif
 		}
 
 		ups->fd = sock_fd;

clients/upscmd.c

@@ -20,11 +20,15 @@
 #include "common.h"
 #include "nut_platform.h"
 
+#ifndef WIN32
 #include <pwd.h>
 #include <netdb.h>
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
+#else
+#include "wincompat.h"
+#endif
 
 #include "upsclient.h"
 

clients/upslog.c

@@ -39,13 +39,19 @@
 #include "timehead.h"
 #include "upslog.h"
 
+#ifdef WIN32
+#include "wincompat.h"
+#endif
+
 	static	int	port, reopen_flag = 0, exit_flag = 0;
 	static	char	*upsname, *hostname;
 	static	UPSCONN_t	ups;
 
 	static	FILE	*logfile;
 	static	const	char *logfn, *monhost;
+#ifndef WIN32
 	static	sigset_t	nut_upslog_sigmask;
+#endif
 	static	char	logbuffer[LARGEBUF], *logformat;
 
 	static	flist_t	*fhead = NULL;
@@ -67,6 +73,7 @@ static void reopen_log(void)
 		fatal_with_errno(EXIT_FAILURE, "could not reopen logfile %s", logfn);
 }
 
+#ifndef WIN32
 static void set_reopen_flag(int sig)
 {
 	reopen_flag = sig;
@@ -76,10 +83,12 @@ static void set_exit_flag(int sig)
 {
 	exit_flag = sig;
 }
+#endif
 
 /* handlers: reload on HUP, exit on INT/QUIT/TERM */
 static void setup_signals(void)
 {
+#ifndef WIN32
 	struct	sigaction	sa;
 
 	sigemptyset(&nut_upslog_sigmask);
@@ -97,6 +106,7 @@ static void setup_signals(void)
 		fatal_with_errno(EXIT_FAILURE, "Can't install SIGQUIT handler");
 	if (sigaction(SIGTERM, &sa, NULL) < 0)
 		fatal_with_errno(EXIT_FAILURE, "Can't install SIGTERM handler");
+#endif
 }
 
 static void help(const char *prog)
@@ -393,6 +403,9 @@ int main(int argc, char **argv)
 
 			case 'l':
 				logfn = optarg;
+#ifdef WIN32
+				logfn = filter_path(optarg);
+#endif
 				break;
 
 			case 'i':
@@ -430,6 +443,9 @@ int main(int argc, char **argv)
 	if (argc >= 3) {
 		monhost = argv[0];
 		logfn = argv[1];
+#ifdef WIN32
+		logfn = filter_path(argv[1]);
+#endif
 		interval = atoi(argv[2]);
 	}