Changeset 48526 in vbox for trunk

Timestamp:

Sep 18, 2013 5:31:56 PM (11 years ago)

Author:

vboxsync

Message:

Network/NAT: Forward port latest changes from 4.2 to switch out of host resolver mode whenever possible and trigger a reconnect only if there is a DNS server available

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (1 diff)
• slirp/bootp.c (modified) (1 diff)
• slirp/dnsproxy/dnsproxy.c (modified) (1 diff)
• slirp/slirp.c (modified) (1 diff)
• slirp/slirp_dns.c (modified) (2 diffs)
• slirp/slirp_state.h (modified) (1 diff)

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -965 +965 @@
     PDRVNAT pThis = (PDRVNAT)pvUser;
 
-    pThis->pIAboveConfig->pfnSetLinkState(pThis->pIAboveConfig, PDMNETWORKLINKSTATE_DOWN_RESUME);
+    LogRel(("NAT: DNS servers changed, triggering reconnect\n"));
+
+    CFDictionaryRef hDnsDict = (CFDictionaryRef)SCDynamicStoreCopyValue(hDynStor, CFSTR("State:/Network/Global/DNS"));
+    if (hDnsDict)
+    {
+        CFArrayRef hArrAddresses = (CFArrayRef)CFDictionaryGetValue(hDnsDict, kSCPropNetDNSServerAddresses);
+        if (hArrAddresses)
+            pThis->pIAboveConfig->pfnSetLinkState(pThis->pIAboveConfig, PDMNETWORKLINKSTATE_DOWN_RESUME);
+
+        CFRelease(hDnsDict);
+    }
 }
 #endif

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

@@ -698 +698 @@
      * within transaction), assuming that transaction can't be longer than 1 min.
      */
-    if (   !pData->fUseHostResolver
+    if (   !pData->fUseHostResolverPermanent
         && (   pData->dnsLastUpdate == 0
-            || curtime - pData->dnsLastUpdate > 60 * 1000)) /* one minute*/
+            || curtime - pData->dnsLastUpdate > 60 * 1000
+            || pData->fUseHostResolver)) /* one minute*/
     {
         uint8_t i = 2; /* i = 0 - tag, i == 1 - length */

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

@@ -362 +362 @@
             static int fail_counter = 0;
             RTMemFree(req);
+            /** @todo: This is completely bogus, fail_counter will always be 0. */
             if (fail_counter == 0)
               LogRel(("NAT/dnsproxy: Empty DNS entry (suppressed 100 times)\n"));

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

@@ -305 +305 @@
     pData->fPassDomain = !fUseHostResolver ? fPassDomain : false;
     pData->fUseHostResolver = fUseHostResolver;
+    pData->fUseHostResolverPermanent = fUseHostResolver;
     pData->pvUser = pvUser;
     pData->netmask = u32Netmask;

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

@@ -337 +337 @@
     AssertPtrReturn(pData, VERR_INVALID_PARAMETER);
     LogFlowFuncEnter();
-    if (!pData->fUseHostResolver)
+    if (!pData->fUseHostResolverPermanent)
     {
         TAILQ_INIT(&pData->pDnsList);
@@ -346 +346 @@
          */
         if (get_dns_addr_domain(pData, NULL) < 0)
-            pData->fUseHostResolver = 1;
+        {
+            /* Load the DNS handler if host resolver mode was not used before. */
+            if (!pData->fUseHostResolver)
+                dns_alias_load(pData);
+            pData->fUseHostResolver = true;
+        }
         else
+        {
+            /* Unload to not intercept in the future. */
+            if (pData->fUseHostResolver)
+                dns_alias_unload(pData);
+            pData->fUseHostResolver = false;
             dnsproxy_init(pData);
+        }
 
         if (!pData->fUseHostResolver)

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

@@ -247 +247 @@
     uma_zone_t zone_ext_refcnt;
     bool fUseHostResolver;
+    /** Flag whether using the host resolver mode is permanent
+     * because the user configured it that way. */
+    bool fUseHostResolverPermanent;
     /* from dnsproxy/dnsproxy.h*/
     unsigned int authoritative_port;