Changeset 15655 in vbox

Timestamp:

Dec 18, 2008 1:28:02 PM (16 years ago)

Author:

vboxsync

Message:

IPRT/tcp.cpp: separated the resolver errors from the other ones, clear the last error before recv to ensure correct handling of 0 byte reads.

File:

• trunk/src/VBox/Runtime/r3/tcp.cpp (modified) (11 diffs)

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

@@ -144 +144 @@
 /**
  * Get the last error as an iprt status code.
+ *
  * @returns iprt status code.
  */
-DECLINLINE(int) rtTcpError(bool fHErrNo)
+DECLINLINE(int) rtTcpError(void)
 {
 #ifdef RT_OS_WINDOWS
     return RTErrConvertFromWin32(WSAGetLastError());
 #else
-    if (fHErrNo)
-    {
-        switch (h_errno)
-        {
-            case HOST_NOT_FOUND:
-                return VERR_NET_HOST_NOT_FOUND;
-                break;
-            case NO_DATA:
-                return VERR_NET_ADDRESS_NOT_AVAILABLE;
-                break;
-            case NO_RECOVERY:
-                return VERR_IO_GEN_FAILURE;
-                break;
-            case TRY_AGAIN:
-                return VERR_TRY_AGAIN;
-                break;
-            default:
-                return VERR_UNRESOLVED_ERROR;
-        }
-    }
-    else
-        return RTErrConvertFromErrno(errno);
+    return RTErrConvertFromErrno(errno);
+#endif
+}
+
+
+/**
+ * Resets the last error.
+ */
+DECLINLINE(void) rtTcpErrorReset(void)
+{
+#ifdef RT_OS_WINDOWS
+    WSASetLastError(0);
+#else
+    errno = 0;
+#endif
+}
+
+
+/**
+ * Get the last resolver error as an iprt status code.
+ *
+ * @returns iprt status code.
+ */
+DECLINLINE(int) rtTcpResolverError(void)
+{
+#ifdef RT_OS_WINDOWS
+    return RTErrConvertFromWin32(WSAGetLastError());
+#else
+    switch (h_errno)
+    {
+        case HOST_NOT_FOUND:
+            return VERR_NET_HOST_NOT_FOUND;
+        case NO_DATA:
+            return VERR_NET_ADDRESS_NOT_AVAILABLE;
+        case NO_RECOVERY:
+            return VERR_IO_GEN_FAILURE;
+        case TRY_AGAIN:
+            return VERR_TRY_AGAIN;
+
+        default:
+            return VERR_UNRESOLVED_ERROR;
+    }
 #endif
 }
@@ -338 +359 @@
             if (!pHostEnt)
             {
-                rc = rtTcpError(true);
+                rc = rtTcpResolverError();
                 AssertMsgFailed(("Could not get host address rc=%Rrc\n", rc));
                 return rc;
@@ -397 +418 @@
                 else
                 {
-                    rc = rtTcpError(false);
+                    rc = rtTcpError();
                     AssertMsgFailed(("listen() %Rrc\n", rc));
                 }
@@ -403 +424 @@
             else
             {
-                rc = rtTcpError(false);
+                rc = rtTcpError();
             }
         }
         else
         {
-            rc = rtTcpError(false);
+            rc = rtTcpError();
             AssertMsgFailed(("setsockopt() %Rrc\n", rc));
         }
@@ -415 +436 @@
     else
     {
-        rc = rtTcpError(false);
+        rc = rtTcpError();
         AssertMsgFailed(("socket() %Rrc\n", rc));
     }
@@ -741 +762 @@
     for (;;)
     {
+        rtTcpErrorReset();
         ssize_t cbBytesRead = recv(Sock, (char *)pvBuffer + cbRead, cbToRead, MSG_NOSIGNAL);
         if (cbBytesRead < 0)
-            return rtTcpError(false);
-        if (cbBytesRead == 0 && rtTcpError(false))
-            return rtTcpError(false);
+            return rtTcpError();
+        if (cbBytesRead == 0 && rtTcpError())
+            return rtTcpError();
         if (pcbRead)
         {
@@ -772 +794 @@
         ssize_t cbWritten = send(Sock, (const char *)pvBuffer, cbBuffer, MSG_NOSIGNAL);
         if (cbWritten < 0)
-            return rtTcpError(false);
+            return rtTcpError();
         AssertMsg(cbBuffer >= (size_t)cbWritten, ("Wrote more than we requested!!! cbWritten=%d cbBuffer=%d rtTcpError()=%d\n",
-                                                  cbWritten, cbBuffer, rtTcpError(false)));
+                                                  cbWritten, cbBuffer, rtTcpError()));
         cbBuffer -= cbWritten;
         pvBuffer = (char *)pvBuffer + cbWritten;
@@ -816 +838 @@
     if (rc == 0)
         return VERR_TIMEOUT;
-    return rtTcpError(false);
+    return rtTcpError();
 }
 
@@ -856 +878 @@
         if (!pHostEnt)
         {
-            rc = rtTcpError(false);
+            rc = rtTcpError();
             AssertMsgFailed(("Could not resolve '%s', rc=%Rrc\n", pszAddress, rc));
             return rc;
@@ -877 +899 @@
             return VINF_SUCCESS;
         }
-        rc = rtTcpError(false);
+        rc = rtTcpError();
         rtTcpClose(Sock, "RTTcpClientConnect");
     }
     else
-        rc = rtTcpError(false);
+        rc = rtTcpError();
     return rc;
 }
@@ -911 +933 @@
     if (!rc)
         return VINF_SUCCESS;
-    rc = rtTcpError(false);
+    rc = rtTcpError();
     AssertMsgFailed(("\"%s\": close(%d) -> %Rrc\n", pszMsg, Sock, rc));
     return rc;