windows: Provide a poll(2) wrapper calling WSAPoll()

diff --git a/src/libstrongswan/utils/utils.h b/src/libstrongswan/utils/utils.h
index da253cc357836a9f5c93be25976632309c4f710d..9e00b8a7a30916fef833b05829ef86c506c3137e 100644 (file)
--- a/src/libstrongswan/utils/utils.h
+++ b/src/libstrongswan/utils/utils.h
@@ -37,6 +37,7 @@
 # include <netdb.h>
 # include <netinet/in.h>
 # include <sched.h>
+# include <poll.h>
 #endif
 
 /**

diff --git a/src/libstrongswan/utils/windows.c b/src/libstrongswan/utils/windows.c
index 8820287b18cc719313df17229bd5a0dd97b955e0..6ce9d77c8731f59a801033c317bb3f7832df2386 100644 (file)
--- a/src/libstrongswan/utils/windows.c
+++ b/src/libstrongswan/utils/windows.c
@@ -13,6 +13,9 @@
  * for more details.
  */
 
+/* WSAPoll() */
+#define _WIN32_WINNT 0x0600
+
 #include "utils.h"
 
 #include <errno.h>
@@ -639,3 +642,11 @@ ssize_t windows_sendto(int sockfd, const void *buf, size_t len, int flags,
        }
        return outlen;
 }
+
+/**
+ * See header
+ */
+int poll(struct pollfd *fds, int nfds, int timeout)
+{
+       return wserr(WSAPoll(fds, nfds, timeout));
+}

diff --git a/src/libstrongswan/utils/windows.h b/src/libstrongswan/utils/windows.h
index 3761e10abb42174557d98f766f7e4f5d14ab07ea..80106ecdbb5643f62a9f6834bd5bbf7dfe708ee6 100644 (file)
--- a/src/libstrongswan/utils/windows.h
+++ b/src/libstrongswan/utils/windows.h
@@ -362,6 +362,34 @@ ssize_t windows_send(int sockfd, const void *buf, size_t len, int flags);
 ssize_t windows_sendto(int sockfd, const void *buf, size_t len, int flags,
                                           const struct sockaddr *dest_addr, socklen_t addrlen);
 
+#if _WIN32_WINNT < 0x0600
+/**
+ * Define pollfd and flags on our own if not specified
+ */
+struct pollfd {
+       SOCKET fd;
+       short events;
+       short revents;
+};
+enum {
+       POLLERR =               0x0001,
+       POLLHUP =               0x0002,
+       POLLNVAL =              0x0004,
+       POLLWRNORM =    0x0010,
+       POLLWRBAND =    0x0020,
+       POLLPRI =               0x0400,
+       POLLRDNORM =    0x0100,
+       POLLRDBAND =    0x0200,
+       POLLIN =                POLLRDNORM | POLLRDBAND,
+       POLLOUT =               POLLWRNORM,
+};
+#endif /* _WIN32_WINNT < 0x0600 */
+
+/**
+ * poll(2), implemented using Winsock2 WSAPoll()
+ */
+int poll(struct pollfd *fds, int nfds, int timeout);
+
 /**
  * Declaration missing on older WinGW
  */