Changeset 15509 in vbox

Timestamp:

Dec 15, 2008 3:10:55 PM (16 years ago)

Author:

vboxsync

Message:

Runtime/TCP: add proper handling of error codes from resolver. Platform-dependent, so squeezed it a bit into the existing code.

File:

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

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

@@ -146 +146 @@
  * @returns iprt status code.
  */
-DECLINLINE(int) rtTcpError(void)
+DECLINLINE(int) rtTcpError(bool fHErrNo)
 {
 #ifdef RT_OS_WINDOWS
     return RTErrConvertFromWin32(WSAGetLastError());
 #else
-    return RTErrConvertFromErrno(errno);
+    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);
 #endif
 }
@@ -317 +338 @@
             if (!pHostEnt)
             {
-                rc = rtTcpError();
+                rc = rtTcpError(true);
                 AssertMsgFailed(("Could not get host address rc=%Rrc\n", rc));
                 return rc;
@@ -376 +397 @@
                 else
                 {
-                    rc = rtTcpError();
+                    rc = rtTcpError(false);
                     AssertMsgFailed(("listen() %Rrc\n", rc));
                 }
@@ -382 +403 @@
             else
             {
-                rc = rtTcpError();
+                rc = rtTcpError(false);
             }
         }
         else
         {
-            rc = rtTcpError();
+            rc = rtTcpError(false);
             AssertMsgFailed(("setsockopt() %Rrc\n", rc));
         }
@@ -394 +415 @@
     else
     {
-        rc = rtTcpError();
+        rc = rtTcpError(false);
         AssertMsgFailed(("socket() %Rrc\n", rc));
     }
@@ -722 +743 @@
         ssize_t cbBytesRead = recv(Sock, (char *)pvBuffer + cbRead, cbToRead, MSG_NOSIGNAL);
         if (cbBytesRead < 0)
-            return rtTcpError();
-        if (cbBytesRead == 0 && rtTcpError())
-            return rtTcpError();
+            return rtTcpError(false);
+        if (cbBytesRead == 0 && rtTcpError(false))
+            return rtTcpError(false);
         if (pcbRead)
         {
@@ -751 +772 @@
         ssize_t cbWritten = send(Sock, (const char *)pvBuffer, cbBuffer, MSG_NOSIGNAL);
         if (cbWritten < 0)
-            return rtTcpError();
+            return rtTcpError(false);
         AssertMsg(cbBuffer >= (size_t)cbWritten, ("Wrote more than we requested!!! cbWritten=%d cbBuffer=%d rtTcpError()=%d\n",
-                                                  cbWritten, cbBuffer, rtTcpError()));
+                                                  cbWritten, cbBuffer, rtTcpError(false)));
         cbBuffer -= cbWritten;
         pvBuffer = (char *)pvBuffer + cbWritten;
@@ -795 +816 @@
     if (rc == 0)
         return VERR_TIMEOUT;
-    return rtTcpError();
+    return rtTcpError(false);
 }
 
@@ -835 +856 @@
         if (!pHostEnt)
         {
-            rc = rtTcpError();
+            rc = rtTcpError(false);
             AssertMsgFailed(("Could not resolve '%s', rc=%Rrc\n", pszAddress, rc));
             return rc;
@@ -856 +877 @@
             return VINF_SUCCESS;
         }
-        rc = rtTcpError();
+        rc = rtTcpError(false);
         rtTcpClose(Sock, "RTTcpClientConnect");
     }
     else
-        rc = rtTcpError();
+        rc = rtTcpError(false);
     return rc;
 }
@@ -890 +911 @@
     if (!rc)
         return VINF_SUCCESS;
-    rc = rtTcpError();
+    rc = rtTcpError(false);
     AssertMsgFailed(("\"%s\": close(%d) -> %Rrc\n", pszMsg, Sock, rc));
     return rc;