Changeset 18874 in vbox for trunk/src/VBox

Timestamp:

Apr 14, 2009 4:07:04 AM (16 years ago)

Author:

vboxsync

Message:

NAT: handling empty domain name list moved to package preparing

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bootp.c (modified) (1 diff)
• slirp.c (modified) (2 diffs)

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

@@ -300 +300 @@
             FILL_BOOTP_EXT(q, RFC1533_DNS, 4, &de->de_addr.s_addr);
         }
+        if (LIST_EMPTY(&pData->dns_domain_list_head))
+        {
+                /* Microsoft dhcp client doen't like domain-less dhcp and trimmed packets*/
+                /* dhcpcd client very sad if no domain name is passed */
+                FILL_BOOTP_EXT(q, RFC1533_DOMAINNAME, 1, " "); 
+        }
         LIST_FOREACH(dd, &pData->dns_domain_list_head, dd_list)
         {

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

@@ -340 +340 @@
     struct dns_entry *da = NULL;
     struct dns_domain_entry *dd = NULL;
-    int fzerro_len_added = 0;
     ULONG ret = ERROR_SUCCESS;
 
@@ -409 +408 @@
 
             if (!suffix || strlen(suffix) == 0) {
-                /* dhcpcd client very sad if no domain name is passed */
                 RTStrFree(suffix);
-                if (fzerro_len_added)
-                    goto next_dns;
-                fzerro_len_added = 1;
-                suffix = RTStrDup(" ");
+                goto next_dns;
             }