vbox的更動 39801 路徑 trunk/src/VBox/Runtime/r3/socket.cpp

時間撮記:

2012-1-18 下午06:01:11 (13 年 以前)

作者:

vboxsync

訊息:

IPRT: socket / address resolving fixes.

檔案:

• trunk/src/VBox/Runtime/r3/socket.cpp (修改) (14 筆差異)

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

@@ -55 +55 @@
 #include <iprt/asm.h>
 #include <iprt/assert.h>
+#include <iprt/ctype.h>
 #include <iprt/err.h>
 #include <iprt/mempool.h>
@@ -157 +158 @@
 {
     struct sockaddr     Addr;
-    struct sockaddr_in  Ipv4;
+    struct sockaddr_in  IPv4;
 #ifdef IPRT_WITH_TCPIP_V6
-    struct sockaddr_in6 Ipv6;
+    struct sockaddr_in6 IPv6;
 #endif
 } RTSOCKADDRUNION;
@@ -239 +240 @@
         RT_ZERO(*pAddr);
         pAddr->enmType      = RTNETADDRTYPE_IPV4;
-        pAddr->uPort        = RT_N2H_U16(pSrc->Ipv4.sin_port);
-        pAddr->uAddr.IPv4.u = pSrc->Ipv4.sin_addr.s_addr;
+        pAddr->uPort        = RT_N2H_U16(pSrc->IPv4.sin_port);
+        pAddr->uAddr.IPv4.u = pSrc->IPv4.sin_addr.s_addr;
     }
 #ifdef IPRT_WITH_TCPIP_V6
@@ -248 +249 @@
         RT_ZERO(*pAddr);
         pAddr->enmType            = RTNETADDRTYPE_IPV6;
-        pAddr->uPort              = RT_N2H_U16(pSrc->Ipv6.sin6_port);
-        pAddr->uAddr.IPv6.au32[0] = pSrc->Ipv6.sin6_addr.s6_addr32[0];
-        pAddr->uAddr.IPv6.au32[1] = pSrc->Ipv6.sin6_addr.s6_addr32[1];
-        pAddr->uAddr.IPv6.au32[2] = pSrc->Ipv6.sin6_addr.s6_addr32[2];
-        pAddr->uAddr.IPv6.au32[3] = pSrc->Ipv6.sin6_addr.s6_addr32[3];
+        pAddr->uPort              = RT_N2H_U16(pSrc->IPv6.sin6_port);
+        pAddr->uAddr.IPv6.au32[0] = pSrc->IPv6.sin6_addr.s6_addr32[0];
+        pAddr->uAddr.IPv6.au32[1] = pSrc->IPv6.sin6_addr.s6_addr32[1];
+        pAddr->uAddr.IPv6.au32[2] = pSrc->IPv6.sin6_addr.s6_addr32[2];
+        pAddr->uAddr.IPv6.au32[3] = pSrc->IPv6.sin6_addr.s6_addr32[3];
     }
 #endif
@@ -268 +269 @@
  * @param   pDst                The source address.
  * @param   cbSrc               The size of the source address.
- */
-static int rtSocketAddrFromNetAddr(PCRTNETADDR pAddr, RTSOCKADDRUNION *pDst, size_t cbDst)
+ * @param   pcbAddr             Where to store the size of the returned address.
+ *                              Optional
+ */
+static int rtSocketAddrFromNetAddr(PCRTNETADDR pAddr, RTSOCKADDRUNION *pDst, size_t cbDst, int *pcbAddr)
 {
     RT_BZERO(pDst, cbDst);
@@ -276 +279 @@
     {
         pDst->Addr.sa_family       = AF_INET;
-        pDst->Ipv4.sin_port        = RT_H2N_U16(pAddr->uPort);
-        pDst->Ipv4.sin_addr.s_addr = pAddr->uAddr.IPv4.u;
+        pDst->IPv4.sin_port        = RT_H2N_U16(pAddr->uPort);
+        pDst->IPv4.sin_addr.s_addr = pAddr->uAddr.IPv4.u;
+        if (pcbAddr)
+            *pcbAddr = sizeof(pDst->IPv4);
     }
 #ifdef IPRT_WITH_TCPIP_V6
@@ -284 +289 @@
     {
         pDst->Addr.sa_family              = AF_INET6;
-        pDst->Ipv6.sin6_port              = RT_H2N_U16(pAddr->uPort);
-        pSrc->Ipv6.sin6_addr.s6_addr32[0] = pAddr->uAddr.IPv6.au32[0];
-        pSrc->Ipv6.sin6_addr.s6_addr32[1] = pAddr->uAddr.IPv6.au32[1];
-        pSrc->Ipv6.sin6_addr.s6_addr32[2] = pAddr->uAddr.IPv6.au32[2];
-        pSrc->Ipv6.sin6_addr.s6_addr32[3] = pAddr->uAddr.IPv6.au32[3];
+        pDst->IPv6.sin6_port              = RT_H2N_U16(pAddr->uPort);
+        pSrc->IPv6.sin6_addr.s6_addr32[0] = pAddr->uAddr.IPv6.au32[0];
+        pSrc->IPv6.sin6_addr.s6_addr32[1] = pAddr->uAddr.IPv6.au32[1];
+        pSrc->IPv6.sin6_addr.s6_addr32[2] = pAddr->uAddr.IPv6.au32[2];
+        pSrc->IPv6.sin6_addr.s6_addr32[3] = pAddr->uAddr.IPv6.au32[3];
+        if (pcbAddr)
+            *pcbAddr = sizeof(pDst->IPv6);
     }
 #endif
@@ -580 +587 @@
 }
 
+static bool rtSocketIsIPv4Numerical(const char *pszAddress, PRTNETADDRIPV4 pAddr)
+{
+
+    /* Empty address resolves to the INADDR_ANY address (good for bind). */
+    if (!*pszAddress)
+    {
+        pAddr->u = INADDR_ANY;
+        return true;
+    }
+
+    /* Four quads? */
+    char *psz = (char *)pszAddress;
+    for (int i = 0; i < 4; i++)
+    {
+        uint8_t u8;
+        int rc = RTStrToUInt8Ex(psz, &psz, 0, &u8);
+        if (rc != VINF_SUCCESS)
+            return false;
+        if (*psz != (i < 3 ? '.' : '\0'))
+            return false;
+        psz++;
+
+        pAddr->au8[i] = u8;             /* big endian */
+    }
+
+    return true;
+}
 
 RTDECL(int) RTSocketParseInetAddress(const char *pszAddress, unsigned uPort, PRTNETADDR pAddr)
@@ -606 +640 @@
 
     /*
-     * Resolve the address.
+     * Resolve the address. Pretty crude at the moment, but we have to make
+     * sure to not ask the NT 4 gethostbyname about an IPv4 address as it may
+     * give a wrong answer.
      */
     /** @todo this only supports IPv4, and IPv6 support needs to be added.
-     * It probably needs to be converted to getnameinfo(). */
-    struct hostent *pHostEnt = NULL;
+     * It probably needs to be converted to getaddrinfo(). */
+    RTNETADDRIPV4 IPv4Quad;
+    if (rtSocketIsIPv4Numerical(pszAddress, &IPv4Quad))
+    {
+        RT_ZERO(*pAddr);
+        pAddr->enmType      = RTNETADDRTYPE_IPV4;
+        pAddr->uPort        = uPort;
+        pAddr->uAddr.IPv4   = IPv4Quad;
+        return VINF_SUCCESS;
+    }
+
+    struct hostent *pHostEnt;
     pHostEnt = gethostbyname(pszAddress);
     if (!pHostEnt)
     {
-        struct in_addr InAddr;
-        InAddr.s_addr = inet_addr(pszAddress);
-        pHostEnt = gethostbyaddr((char *)&InAddr, 4, AF_INET);
-        if (!pHostEnt)
-        {
-            rc = rtSocketResolverError();
-            AssertMsgFailed(("Could not resolve '%s', rc=%Rrc\n", pszAddress, rc));
-            return rc;
-        }
+        rc = rtSocketResolverError();
+        AssertMsgFailed(("Could not resolve '%s', rc=%Rrc\n", pszAddress, rc));
+        return rc;
     }
 
@@ -857 +897 @@
     if (pAddr)
     {
-        rc = rtSocketAddrFromNetAddr(pAddr, &u, sizeof(u));
+        rc = rtSocketAddrFromNetAddr(pAddr, &u, sizeof(u), NULL);
         if (RT_FAILURE(rc))
             return rc;
@@ -1393 +1433 @@
  * @returns IPRT status code.
  * @param   hSocket             The socket handle.
- * @param   pAddr               The socket address to bind to.
- * @param   cbAddr              The size of the address structure @a pAddr
- *                              points to.
- */
-int rtSocketBind(RTSOCKET hSocket, const struct sockaddr *pAddr, int cbAddr)
+ * @param   pAddr               The address to bind to.
+ */
+int rtSocketBind(RTSOCKET hSocket, PCRTNETADDR pAddr)
 {
     /*
@@ -1407 +1445 @@
     AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS);
 
-    int rc = VINF_SUCCESS;
-    if (bind(pThis->hNative, pAddr, cbAddr) != 0)
-        rc = rtSocketError();
+    RTSOCKADDRUNION u;
+    int             cbAddr;
+    int rc = rtSocketAddrFromNetAddr(pAddr, &u, sizeof(u), &cbAddr);
+    if (RT_SUCCESS(rc))
+    {
+        if (bind(pThis->hNative, &u.Addr, cbAddr) != 0)
+            rc = rtSocketError();
+    }
 
     rtSocketUnlock(pThis);
@@ -1508 +1551 @@
  * @param   hSocket             The socket handle.
  * @param   pAddr               The socket address to connect to.
- * @param   cbAddr              The size of the address structure @a pAddr
- *                              points to.
- */
-int rtSocketConnect(RTSOCKET hSocket, const struct sockaddr *pAddr, int cbAddr)
+ */
+int rtSocketConnect(RTSOCKET hSocket, PCRTNETADDR pAddr)
 {
     /*
@@ -1521 +1562 @@
     AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS);
 
-    int rc = VINF_SUCCESS;
-    if (connect(pThis->hNative, pAddr, cbAddr) != 0)
-        rc = rtSocketError();
+    RTSOCKADDRUNION u;
+    int             cbAddr;
+    int rc = rtSocketAddrFromNetAddr(pAddr, &u, sizeof(u), &cbAddr);
+    if (RT_SUCCESS(rc))
+    {
+Log(("Calling connect()...\n%.*Rhxs\n", cbAddr, &u));
+        if (connect(pThis->hNative, &u.Addr, cbAddr) != 0)
+            rc = rtSocketError();
+    }
 
     rtSocketUnlock(pThis);