Changeset 23666 in vbox

Timestamp:

Oct 10, 2009 1:18:36 AM (15 years ago)

Author:

vboxsync

Message:

RTTcpRead: recv returns 0 and errno = 0 when the server shuts down the socket in a normal fashion. Return VERR_NET_SHUTDOWN instead of spinning for ever.

File:

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

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

@@ -800 +800 @@
         rtTcpErrorReset();
         ssize_t cbBytesRead = recv(Sock, (char *)pvBuffer + cbRead, cbToRead, MSG_NOSIGNAL);
-        if (cbBytesRead < 0)
-            return rtTcpError();
-        if (cbBytesRead == 0 && rtTcpError())
-            return rtTcpError();
+        if (cbBytesRead <= 0)
+        {
+            int rc = rtTcpError();
+            Assert(RT_FAILURE_NP(rc) || cbBytesRead == 0);
+            if (RT_FAILURE_NP(rc))
+                return rc;
+            if (pcbRead)
+            {
+                *pcbRead = 0;
+                return VINF_SUCCESS;
+            }
+            return VERR_NET_SHUTDOWN;
+        }
         if (pcbRead)
         {