Changeset 18584 in vbox for trunk/src

Timestamp:

Mar 31, 2009 7:04:22 PM (16 years ago)

Author:

vboxsync

Message:

NAT: adding name domains improved.
multibytes handling in IPRT style
memory leak seems to be illuminated

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bootp.c (modified) (4 diffs)
• slirp.c (modified) (7 diffs)
• slirp_state.h (modified) (3 diffs)

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

@@ -275 +275 @@
 #ifdef VBOX_WITH_MULTI_DNS
         struct dns_entry *de = NULL;
+        struct dns_domain_entry *dd = NULL;
+        int added = 0;
 #endif
         uint32_t lease_time = htonl(LEASE_TIME);
@@ -298 +300 @@
             FILL_BOOTP_EXT(q, RFC1533_DNS, 4, &de->de_addr.s_addr);
         }
+        LIST_FOREACH(dd, &pData->dns_domain_list_head, dd_list)
+        {
+            
+            if (dd->dd_pszDomain == NULL)
+                continue;
+            if (added != 0) 
+                FILL_BOOTP_EXT(q, RFC1533_DOMAINNAME, 1, ","); /* never meet valid separator here in RFC1533*/
+            else
+                added = 1;
+            val = (int)strlen(dd->dd_pszDomain);
+            FILL_BOOTP_EXT(q, RFC1533_DOMAINNAME, val, dd->dd_pszDomain);
+        }
 #endif
 
@@ -308 +322 @@
         }
 
+#ifndef VBOX_WITH_MULTI_DNS
         if (pData->pszDomain && pData->fPassDomain)
         {
@@ -313 +328 @@
             FILL_BOOTP_EXT(q, RFC1533_DOMAINNAME, val, pData->pszDomain);
         }
+#endif
     }
     *q++ = RFC1533_END;

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

@@ -336 +336 @@
     char *suffix;
     struct dns_entry *da = NULL;
+    struct dns_domain_entry *dd = NULL;
     ULONG ret = ERROR_SUCCESS;
 
@@ -369 +370 @@
     while(addr != NULL)
     {
-#if 1
-        size_t buff_size;
-#endif
+        int found;
         if (addr->OperStatus != IfOperStatusUp)
             goto next;
@@ -396 +395 @@
             }
             LIST_INSERT_HEAD(&pData->dns_list_head, da, de_list);
+
+            if (addr->DnsSuffix == NULL)
+                goto next_dns;
+
+            /*uniq*/
+            RTUtf16ToUtf8(addr->DnsSuffix, &suffix);
+            found = 0;
+            LIST_FOREACH(dd, &pData->dns_domain_list_head, dd_list) 
+            {
+                if (   dd->dd_pszDomain != NULL 
+                    && strcmp(dd->dd_pszDomain, suffix) == 0) 
+                {
+                    found = 1;
+                    break;
+                }
+            }
+            if (found == 0) 
+            {
+                dd = RTMemAllocZ(sizeof(struct dns_domain_entry));
+                if (dd == NULL)
+                {
+                    LogRel(("NAT: not enought memory\n"));
+                    return VERR_NO_MEMORY;
+                }    
+                dd->dd_pszDomain = suffix;
+                LogRel(("NAT: adding domain name %s to search list\n", dd->dd_pszDomain));
+                LIST_INSERT_HEAD(&pData->dns_domain_list_head, dd, dd_list);
+            }
         next_dns:
             dns = dns->Next;
         }
-#if 1
-        buff_size = wcstombs(NULL, addr->DnsSuffix, 0);
-        if (buff_size == 0 || buff_size == (size_t)-1)
-            goto next;
-        suffix = RTMemAllocZ(buff_size + 1);
-        wcstombs(suffix, addr->DnsSuffix, buff_size);
-        suffix[buff_size] = '\0';
-        LogRel(("NAT: adding %s to DNS suffix list\n", suffix));
-        *ppszDomain = suffix; /* may leak memory */
-#else /** @todo r=bird: try this (no time to test for BETA2). Btw. what happend to suffix 'adding', the code above doesn't do what the LogRel() says... */
-        /* add the first one only. */
-        if (ppszDomain && !*ppszDomain)
-            RTUtf16ToUtf8(addr->DnsSuffix, ppszDomain);
-#endif
     next:
         addr = addr->Next;
     }
-    /** @todo add dns suffix if required */
-    if (ppszDomain && *ppszDomain)
-        LogRel(("NAT: DNS suffix %s\n", *ppszDomain));
     return 0;
 }
@@ -502 +512 @@
             found++;
         }
+#ifndef VBOX_WITH_MULTI_DNS
         if (   ppszDomain
             && (!strncmp(buff, "domain", 6) || !strncmp(buff, "search", 6)))
@@ -524 +535 @@
             }
         }
+#else
+        if ((!strncmp(buff, "domain", 6) || !strncmp(buff, "search", 6)))
+        {
+            char *tok;
+            char *saveptr;
+            struct dns_domain_entry *dd = NULL;
+            int found = 0;
+            tok = strtok_r(&buff[6], " \t\n", &saveptr);
+            LIST_FOREACH(dd, &pData->dns_domain_list_head, dd_list)
+            {
+                if(    tok != NULL 
+                    && strcmp(tok, dd->dd_pszDomain) == 0)
+                {
+                    found = 1;
+                    break;
+                }
+            }
+            if (tok != NULL && found == 0) {
+                dd = RTMemAllocZ(sizeof(struct dns_domain_entry));
+                if (dd == NULL)
+                {
+                    LogRel(("NAT: not enought memory to add domain list\n"));
+                    return VERR_NO_MEMORY;
+                }    
+                dd->dd_pszDomain = RTStrDup(tok);
+                LogRel(("NAT: adding domain name %s to search list\n", dd->dd_pszDomain));
+                LIST_INSERT_HEAD(&pData->dns_domain_list_head, dd, dd_list);
+            }
+        }
+#endif
     }
     fclose(f);
@@ -536 +577 @@
 {
     LIST_INIT(&pData->dns_list_head);
-    return get_dns_addr_domain(pData, true, NULL, &pData->pszDomain);
-}
+    LIST_INIT(&pData->dns_domain_list_head);
+    return get_dns_addr_domain(pData, true, NULL, NULL);
+}
+
 static void slirp_release_dns_list(PNATState pData)
 {
     struct dns_entry *de = NULL;
-    while(!LIST_EMPTY(&pData->dns_list_head)) {
-        de = LIST_FIRST(&pData->dns_list_head);
-        LIST_REMOVE(de, de_list);
-        RTMemFree(de);
+    struct dns_domain_entry *dd = NULL;
+    while(!LIST_EMPTY(&pData->dns_domain_list_head)) {
+        dd = LIST_FIRST(&pData->dns_domain_list_head);
+        LIST_REMOVE(dd, dd_list);
+        if (dd->dd_pszDomain != NULL)
+            RTStrFree(dd->dd_pszDomain); 
+        RTMemFree(dd);
+    }
+    while(!LIST_EMPTY(&pData->dns_domain_list_head)) {
+        dd = LIST_FIRST(&pData->dns_domain_list_head);
+        LIST_REMOVE(dd, dd_list);
+        if (dd->dd_pszDomain != NULL)
+            RTStrFree(dd->dd_pszDomain); 
+        RTMemFree(dd);
     }
 }
@@ -677 +730 @@
 void slirp_term(PNATState pData)
 {
+#ifndef VBOX_WITH_MULTI_DNS
     if (pData->pszDomain)
         RTStrFree((char *)(void *)pData->pszDomain);
+#endif
 
 #ifdef RT_OS_WINDOWS

trunk/src/VBox/Devices/Network/slirp/slirp_state.h

@@ -57 +57 @@
 
 #ifdef VBOX_WITH_MULTI_DNS
+struct dns_domain_entry
+{
+        char *dd_pszDomain;
+        LIST_ENTRY(dns_domain_entry) dd_list;
+};
+LIST_HEAD(dns_domain_list_head, dns_domain_entry);
+
 struct dns_entry
 {
@@ -114 +121 @@
 # endif
     struct dns_list_head dns_list_head;
+    struct dns_domain_list_head dns_domain_list_head;
 #endif
     struct in_addr tftp_server;
@@ -122 +130 @@
     char slirp_hostname[33];
     bool fPassDomain;
+#ifndef VBOX_WITH_MULTI_DNS
     const char *pszDomain;
+#endif
     /* Stuff from tcp_input.c */
     struct socket tcb;