Changeset 54895 in vbox

Timestamp:

Mar 21, 2015 9:39:24 PM (10 years ago)

Author:

vboxsync

Message:

NAT/Network: group windows and unix code to make socket non-blocking
into one #if/#elif.

File:

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

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

@@ -318 +318 @@
     }
 
-#if !defined(SOCK_NONBLOCK) && !defined(RT_OS_WINDOWS)
-    {
-        int sflags;
-
-        sflags = fcntl(s, F_GETFL, 0);
-        if (sflags < 0) {
-            DPRINTF(("F_GETFL: %R[sockerr]\n", SOCKERRNO()));
-            closesocket(s);
-            return INVALID_SOCKET;
-        }
-
-        status = fcntl(s, F_SETFL, sflags | O_NONBLOCK);
-        if (status < 0) {
-            DPRINTF(("O_NONBLOCK: %R[sockerr]\n", SOCKERRNO()));
-            closesocket(s);
-            return INVALID_SOCKET;
-        }
-    }
-#endif
-
-#if !defined(SOCK_NOSIGPIPE) && defined(SO_NOSIGPIPE)
-    if (stype == SOCK_STREAM) {
-        int on = 1;
-        const socklen_t onlen = sizeof(on);
-
-        status = setsockopt(s, SOL_SOCKET, SO_NOSIGPIPE, &on, onlen);
-        if (status < 0) {
-            DPRINTF(("SO_NOSIGPIPE: %R[sockerr]\n", SOCKERRNO()));
-            closesocket(s);
-            return INVALID_SOCKET;
-        }
-    }
-#endif
-
 #if defined(RT_OS_WINDOWS)
     {
@@ -358 +324 @@
         if (status == SOCKET_ERROR) {
             DPRINTF(("FIONBIO: %R[sockerr]\n", SOCKERRNO()));
+            closesocket(s);
+            return INVALID_SOCKET;
+        }
+    }
+#elif !defined(SOCK_NONBLOCK)
+    {
+        int sflags;
+
+        sflags = fcntl(s, F_GETFL, 0);
+        if (sflags < 0) {
+            DPRINTF(("F_GETFL: %R[sockerr]\n", SOCKERRNO()));
+            closesocket(s);
+            return INVALID_SOCKET;
+        }
+
+        status = fcntl(s, F_SETFL, sflags | O_NONBLOCK);
+        if (status < 0) {
+            DPRINTF(("O_NONBLOCK: %R[sockerr]\n", SOCKERRNO()));
+            closesocket(s);
+            return INVALID_SOCKET;
+        }
+    }
+#endif
+
+#if !defined(SOCK_NOSIGPIPE) && defined(SO_NOSIGPIPE)
+    if (stype == SOCK_STREAM) {
+        int on = 1;
+        const socklen_t onlen = sizeof(on);
+
+        status = setsockopt(s, SOL_SOCKET, SO_NOSIGPIPE, &on, onlen);
+        if (status < 0) {
+            DPRINTF(("SO_NOSIGPIPE: %R[sockerr]\n", SOCKERRNO()));
             closesocket(s);
             return INVALID_SOCKET;