Changeset 52288 in vbox for trunk/src/VBox/NetworkServices/NAT

Timestamp:

Aug 6, 2014 2:08:59 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95398

Message:

NAT/Net: Ouch, FIONBIO argument has been wrong since initial check-in
so on Windows we have been doing blocking connect(). Fortunately,
WSAEventSelect() automatically switches sockets to non-blocking mode
when we start polling them.

Fix it and adjust the test of connect()'s errno, since Windows returns
EWOULDBLOCK instead of EINPROGRESS on non-blocking connect.

File:

• trunk/src/VBox/NetworkServices/NAT/proxy.c (modified) (2 diffs)

trunk/src/VBox/NetworkServices/NAT/proxy.c

@@ -338 +338 @@
 #if defined(RT_OS_WINDOWS)
     {
-        u_long mode = 0;
+        u_long mode = 1;
         status = ioctlsocket(s, FIONBIO, &mode);
         if (status == SOCKET_ERROR) {
@@ -436 +436 @@
 
     status = connect(s, pdst_sa, dst_sa_len);
-    if (status == SOCKET_ERROR && SOCKERRNO() != EINPROGRESS) {
+    if (status == SOCKET_ERROR
+#if !defined(RT_OS_WINDOWS)
+        && SOCKERRNO() != EINPROGRESS
+#else
+        && SOCKERRNO() != EWOULDBLOCK
+#endif
+        )
+    {
         sockerr = SOCKERRNO();
         DPRINTF(("socket %d: connect: %R[sockerr]\n", s, sockerr));