Changeset 18225 in vbox

Timestamp:

Mar 24, 2009 7:56:11 PM (16 years ago)

Author:

vboxsync

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

44950

Message:

get_dns_addr_domain: wcstombs returns the size without counting the terminator.

File:

• trunk/src/VBox/Devices/Network/slirp/slirp.c (modified) (14 diffs)

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -101 +101 @@
     } while (0)
 # else /* !RT_OS_WINDOWS */
-#  ifdef VBOX_WITH_SIMPLIFIED_SLIRP_SYNC 
+#  ifdef VBOX_WITH_SIMPLIFIED_SLIRP_SYNC
 #   define DO_WIN_CHECK_FD_SET(so, events, fdset ) DO_CHECK_FD_SET((so), (events), fdset)
 #  else /* VBOX_WITH_SIMPLIFIED_SLIRP_SYNC */
@@ -335 +335 @@
     struct dns_entry *da = NULL;
     ULONG ret = ERROR_SUCCESS;
-    
+
     /* @todo add SKIPing flags to get only required information */
 
     ret = pData->pfGetAdaptersAddresses(AF_INET, 0, NULL /* reserved */, addresses, &size);
-    if (ret != ERROR_BUFFER_OVERFLOW) 
+    if (ret != ERROR_BUFFER_OVERFLOW)
     {
         LogRel(("NAT: error %lu occured on capacity detection operation\n", ret));
         return -1;
     }
-    
-    if (size == 0) 
+
+    if (size == 0)
     {
         LogRel(("NAT: Win socket API returns non capacity\n"));
         return -1;
     }
-    
+
     addresses = RTMemAllocZ(size);
-    if (addresses == NULL) 
+    if (addresses == NULL)
     {
         LogRel(("NAT: No memory available \n"));
@@ -362 +362 @@
     {
         LogRel(("NAT: error %lu occured on fetching adapters info\n", ret));
-        return -1; 
+        return -1;
     }
     addr = addresses;
-    while(addr != NULL) 
+    while(addr != NULL)
     {
         size_t buff_size;
@@ -371 +371 @@
             goto next;
         dns = addr->FirstDnsServerAddress;
-        while (dns != NULL) 
+        while (dns != NULL)
         {
             struct sockaddr *saddr = dns->Address.lpSockaddr;
@@ -386 +386 @@
             if ((((struct sockaddr_in *)saddr)->sin_addr.s_addr & htonl(IN_CLASSA_NET)) == ntohl(INADDR_LOOPBACK & IN_CLASSA_NET)) {
                 da->de_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS);
-            } 
-            else 
+            }
+            else
             {
                 da->de_addr.s_addr = ((struct sockaddr_in *)saddr)->sin_addr.s_addr;
             }
             LIST_INSERT_HEAD(&pData->dns_list_head, da, de_list);
-        next_dns:    
+        next_dns:
             dns = dns->Next;
         }
         buff_size = wcstombs(NULL, addr->DnsSuffix, 0);
-        if (buff_size == 0) 
+        if (buff_size == 0)
             goto next;
-        suffix = RTMemAllocZ(buff_size);
+        suffix = RTMemAllocZ(buff_size + 1);
         wcstombs(suffix, addr->DnsSuffix, buff_size);
         LogRel(("NAT: adding %s to DNS suffix list\n", suffix));
         *ppszDomain = suffix;
-        next:
+    next:
         addr = addr->Next;
     }
     /*@todo add dns suffix if required */
     LogRel(("NAT: adding dns suffix %s to the list \n", ppszDomain));
-    return 0; 
+    return 0;
 }
 # endif /* VBOX_WITH_MULTI_DNS */
@@ -871 +871 @@
 #ifdef VBOX_WITH_SLIRP_DNS_PROXY
                     Log2(("NAT: %R[natsock] expired\n", so));
-                    if (so->so_timeout != NULL) 
+                    if (so->so_timeout != NULL)
                     {
                         so->so_timeout(pData, so, so->so_timeout_arg);
-                    } 
+                    }
 #endif
 #ifdef VBOX_WITH_SLIRP_MT
@@ -1207 +1207 @@
                 inq = outq = 0;
                 status = getsockopt(so->s, SOL_SOCKET, SO_ERROR, &err, &optlen);
-                if (status != 0) 
+                if (status != 0)
                     Log(("NAT: can't get error status from %R[natsock]\n", so));
 #ifndef RT_OS_SOLARIS
@@ -1217 +1217 @@
                 }
                 status = ioctl(so->s, TIOCOUTQ, &outq); /* SIOCOUTQ see previous comment */
-                if (status != 0) 
+                if (status != 0)
                     Log(("NAT: can't get depth of OUT queue from %R[natsock]\n", so));
 #else
                 /*
                  * Solaris has bit different ioctl commands and its handlings
-                 * hint: streamio(7) I_NREAD 
+                 * hint: streamio(7) I_NREAD
                  */
 #endif
@@ -1229 +1229 @@
                 {
                     /**
-                     * Check if we need here take care about gracefull connection 
+                     * Check if we need here take care about gracefull connection
                      * @todo try with proxy server
                      */
@@ -1235 +1235 @@
                     {
                         /*
-                         * Never meet inq != 0 or outq != 0, anyway let it stay for a while 
-                         * in case it happens we'll able to detect it. 
-                         * Give TCP/IP stack wait or expire the socket. 
+                         * Never meet inq != 0 or outq != 0, anyway let it stay for a while
+                         * in case it happens we'll able to detect it.
+                         * Give TCP/IP stack wait or expire the socket.
                          */
                         Log(("NAT: %R[natsock] err(%d:%s) s(in:%d,out:%d)happens on read I/O, "
@@ -1247 +1247 @@
                 if (   !UNIX_CHECK_FD_SET(so, NetworkEvents, readfds)
                     && !UNIX_CHECK_FD_SET(so, NetworkEvents, writefds)
-                    && !UNIX_CHECK_FD_SET(so, NetworkEvents, xfds)) 
+                    && !UNIX_CHECK_FD_SET(so, NetworkEvents, xfds))
                 {
                     Log(("NAT: system expires the socket %R[natsock] err(%d:%s) s(in:%d,out:%d) happens on non-I/O. ",
@@ -1254 +1254 @@
                 }
                 Log(("NAT: %R[natsock] we've met(%d:%s) s(in:%d, out:%d) unhandled combination hup (%d) "
-                    "rederr(%d) on (r:%d, w:%d, x:%d)\n", 
+                    "rederr(%d) on (r:%d, w:%d, x:%d)\n",
                         so, err, strerror(err),
                         inq, outq,
@@ -1262 +1262 @@
                         UNIX_CHECK_FD_SET(so, ign, writefds),
                         UNIX_CHECK_FD_SET(so, ign, xfds)));
-                /* 
+                /*
                  * Give OS's TCP/IP stack a chance to resolve an issue or expire the socket.
                  */
@@ -1648 +1648 @@
     uint16_t hdport, hsport, service;
     hdport = ntohs(dport);
-    hsport = ntohs(sport); 
+    hsport = ntohs(sport);
     Log2(("proto: %d, dport: %d sport: %d\n", proto, hdport, hsport));
     service = 0;
 #if 0
     /* Always return 0 here */
-    switch (hdport) 
+    switch (hdport)
     {
         case 500:
                 /* service = sport; */
         break;
-    } 
+    }
 #endif
     Log2(("service : %d\n", service));