From: Heiko Hund <heiko.hund@sophos.com>
Date: Tue, 17 Jul 2012 16:19:53 +0000 (+0200)
Subject: make non-blocking connect work on Windows
X-Git-Tag: v2.3_alpha3~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9081e0ad4c496a0334a21fc4e8e4f1f73a470b5a;p=thirdparty%2Fopenvpn.git

make non-blocking connect work on Windows

Instead of EINPROGRESS WinSock2 returns WSAEWOULDBLOCK if a non-blocking
connect(2) cannot be completed immediately.

Signed-off-by: Heiko Hund <heiko.hund@sophos.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: 1342541993-32462-1-git-send-email-heiko.hund@sophos.com
URL: http://article.gmane.org/gmane.network.openvpn.devel/6875
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
---

diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
index 54ebce752..02e2768f1 100644
--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.c
@@ -1165,7 +1165,13 @@ openvpn_connect (socket_descriptor_t sd,
   status = connect (sd, &remote->addr.sa, af_addr_size(remote->addr.sa.sa_family));
   if (status)
     status = openvpn_errno_socket ();
-  if (status == EINPROGRESS)
+  if (
+#ifdef WIN32
+    status == WSAEWOULDBLOCK
+#else
+    status == EINPROGRESS
+#endif
+  )
     {
       while (true)
 	{