Changeset 43206 in vbox for trunk

Timestamp:

Sep 5, 2012 1:31:05 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80594

Message:

More cleanups.

Location:

trunk

Files:

• include/iprt/socket.h (modified) (1 diff)
• src/VBox/Runtime/r3/socket.cpp (modified) (4 diffs)

trunk/include/iprt/socket.h

@@ -138 +138 @@
  * @param   pszResult       Where to return the result.
  * @param   pcbResult       Input: The size of the @a pszResult buffer.
- *                          Output: size of the returned string.
+ *                          Output: size of the returned string.  This is set on
+ *                          VERR_BUFFER_OVERFLOW and most other error statuses.
  * @param   penmAddrType    Input: Which kind of address to return. Valid values
  *                          are:
- *                              - RTNETADDRTYPE_IPV4 -> lookup AF_INET
- *                              - RTNETADDRTYPE_IPV6 -> lookup AF_INET6
- *                              - NULL -> lookup anything
- *                          Output: Yet to be defined or why is this a pointer?
+ *                              - RTNETADDRTYPE_IPV4 -> lookup AF_INET.
+ *                              - RTNETADDRTYPE_IPV6 -> lookup AF_INET6.
+ *                              - RTNETADDRTYPE_INVALID/NULL -> lookup anything.
+ *                          Output: The type of address that is being returned.
+ *                          Not modified on failure.
  */
 RTDECL(int) RTSocketGetAddrInfo(const char *pszHost, char *pszResult, size_t *pcbResult, PRTNETADDRTYPE penmAddrType);

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

@@ -699 +699 @@
 #if defined(RT_OS_OS2) || defined(RT_OS_WINDOWS) /** @todo dynamically resolve the APIs not present in NT4! */
     return VERR_NOT_SUPPORTED;
+
 #else
     int rc;
-    uint8_t const *pbDummy = NULL;
-
-    struct addrinfo *pgrResults = NULL;
-    struct addrinfo *pgrResult = NULL;
-
     if (*pcbResult < 16)
         return VERR_NET_ADDRESS_NOT_AVAILABLE;
@@ -750 +746 @@
 
     /** @todo r=bird: getaddrinfo and freeaddrinfo breaks the additions on NT4. */
+    struct addrinfo *pgrResults = NULL;
     rc = getaddrinfo(pszHost, "", &grHints, &pgrResults);
     if (rc != 0)
@@ -760 +757 @@
         return VERR_NET_ADDRESS_NOT_AVAILABLE;
 
-    pgrResult = pgrResults->ai_next;
+    struct addrinfo const *pgrResult = pgrResults->ai_next;
     if (!pgrResult)
     {
-        /** @todo r=bird: Missing freeaddrinfo call? */
+        freeaddrinfo(pgrResults);
         return VERR_NET_ADDRESS_NOT_AVAILABLE;
     }
 
-    rc = VINF_SUCCESS;
+    uint8_t const  *pbDummy;
     RTNETADDRTYPE   enmAddrType = RTNETADDRTYPE_INVALID;
     size_t          cchIpAddress;
@@ -779 +776 @@
         Assert(cchIpAddress >= 7 && cchIpAddress < sizeof(szIpAddress) - 1);
         enmAddrType = RTNETADDRTYPE_IPV4;
+        rc = VINF_SUCCESS;
     }
     else if (pgrResult->ai_family == AF_INET6)