Changeset 31121 in vbox

Timestamp:

Jul 26, 2010 4:31:04 PM (14 years ago)

Author:

vboxsync

Message:

IPRT/Sockets: Fix switch to blocking mode

File:

• trunk/src/VBox/Runtime/r3/socket.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/socket.cpp

@@ -260 +260 @@
         u_long uBlocking = fBlocking ? 0 : 1;
         if (ioctlsocket(pThis->hNative, FIONBIO, &uBlocking))
-#else
-        if (fcntl(pThis->hNative, F_SETFL, O_NONBLOCK))
-#endif
             rc = rtSocketError();
+#else
+        int fFlags = fcntl(pThis->hNative, F_GETFL, 0);
+        if (fFlags != -1)
+        {
+            if (fBlocking)
+                fFlags &= ~O_NONBLOCK;
+            else
+                fFlags |= O_NONBLOCK;
+
+            if (fcntl(pThis->hNative, F_SETFL, fFlags & ~O_NONBLOCK) == -1)
+                rc = rtSocketError();
+        }
         else
+            rc = rtSocketError();
+#endif
+
+        if (RT_SUCCESS(rc))
             pThis->fBlocking = fBlocking;
     }