Changeset 50046 in vbox for trunk

Timestamp:

Jan 10, 2014 2:06:06 AM (11 years ago)

Author:

vboxsync

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

91535

Message:

NAT/DrvNAT.cpp: introduces drvNATHostNetworkConfigurationChangeEventStrategySelector selecting strategy how to deal with Host Network change event and Host Resume. Function acting in following manner:

• if Slirp configured as exposing host network configuration to guest, we proceed with "re-activating cable connection".
• if Slirp configured as dns proxy, we reconfigure internal DNS state.
• if Slirp configured to use host resolver, we should just ignore event.

currently this function called from couple places: drvNATResume and Host Network change event "listener" (darwin only). This will be changed in the future, when notification of host network change will be finished in Main, and we can drop OS dependent part in DrvNat, processing these events in the same way as port-forwarding done.

File:

• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (4 diffs)

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

@@ -24 +24 @@
 #define __STDC_CONSTANT_MACROS
 #include "slirp/libslirp.h"
+extern "C" {
+#include "slirp/slirp_dns.h"
+};
 #include "slirp/ctl.h"
 
@@ -218 +221 @@
 *******************************************************************************/
 static void drvNATNotifyNATThread(PDRVNAT pThis, const char *pszWho);
+DECLINLINE(void) drvNATHostNetworkConfigurationChangeEventStrategySelector(
+  PDRVNAT pThis,
+  bool fHostNetworkConfigurationEventListener);
+static DECLCALLBACK(int) drvNATReinitializeHostNameResolving(PDRVNAT pThis);
 
 
@@ -972 +979 @@
         CFArrayRef hArrAddresses = (CFArrayRef)CFDictionaryGetValue(hDnsDict, kSCPropNetDNSServerAddresses);
         if (hArrAddresses)
-            pThis->pIAboveConfig->pfnSetLinkState(pThis->pIAboveConfig, PDMNETWORKLINKSTATE_DOWN_RESUME);
+            drvNATHostNetworkConfigurationChangeEventStrategySelector(pThis, /* RT_OS_DARWIN */ true);
 
         CFRelease(hDnsDict);
@@ -1045 +1052 @@
     {
         case VMRESUMEREASON_HOST_RESUME:
+            drvNATHostNetworkConfigurationChangeEventStrategySelector(pThis, !RT_OS_DARWIN);
+            return;
+        default: /* Ignore every other resume reason. */
+            /* do nothing */
+            return;
+    }
+}
+
+
+static DECLCALLBACK(int) drvNATReinitializeHostNameResolving(PDRVNAT pThis)
+{
+    slirpReleaseDnsSettings(pThis->pNATState);
+    slirpInitializeDnsSettings(pThis->pNATState);
+    return VINF_SUCCESS;
+}
+
+/**
+ * This function at this stage could be called from two places, but both from non-NAT thread,
+ * - drvNATResume (EMT?)
+ * - drvNatDnsChanged (darwin, GUI or main) "listener"
+ * When Main's interface IHost will support host network configuration change event on every host,
+ * we won't call it from drvNATResume, but from listener of Main event in the similar way it done 
+ * for port-forwarding, and it wan't be on GUI/main thread, but on EMT thread only.
+ *
+ * Thread here is important, because we need to change DNS server list and domain name (+ perhaps, 
+ * search string) at runtime (VBOX_NAT_ENFORCE_INTERNAL_DNS_UPDATE), we can do it safely on NAT thread,
+ * so with changing other variables (place where we handle update) the main mechanism of update 
+ * _won't_ be changed, the only thing will change is drop of fHostNetworkConfigurationEventListener parameter. 
+ */
+DECLINLINE(void) drvNATHostNetworkConfigurationChangeEventStrategySelector(PDRVNAT pThis,
+                                                                        bool fHostNetworkConfigurationEventListener)
+{
+    int strategy = slirp_host_network_configuration_change_strategy_selector(pThis->pNATState);
+    switch (strategy)
+    {
+                 
+        case VBOX_NAT_HNCE_DNSPROXY:
+            {
+                /**
+                 * It's unsafe to to do it directly on non-NAT thread
+                 * so we schedule the worker and kick the NAT thread. 
+                 */
+                RTREQQUEUE hQueue = pThis->hSlirpReqQueue;
+                
+                int rc = RTReqQueueCallEx(hQueue, NULL /*ppReq*/, 0 /*cMillies*/, 
+                                          RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
+                                          (PFNRT)drvNATReinitializeHostNameResolving, 1, pThis);
+                if (RT_SUCCESS(rc))
+                    drvNATNotifyNATThread(pThis, "drvNATNetworkUp_SendBuf");
+
+
+                return;
+
+            }
+        case VBOX_NAT_HNCE_EXSPOSED_NAME_RESOLUTION_INFO:
             /*
              * Host resumed from a suspend and the network might have changed.
              * Disconnect the guest from the network temporarily to let it pick up the changes.
              */
-#ifndef RT_OS_DARWIN
-            pThis->pIAboveConfig->pfnSetLinkState(pThis->pIAboveConfig,
-                                                  PDMNETWORKLINKSTATE_DOWN_RESUME);
-#endif
+
+            if (fHostNetworkConfigurationEventListener)
+                pThis->pIAboveConfig->pfnSetLinkState(pThis->pIAboveConfig,
+                                                      PDMNETWORKLINKSTATE_DOWN_RESUME);
             return;
-        default: /* Ignore every other resume reason. */
-            /* do nothing */
+        case VBOX_NAT_HNCE_HOSTRESOLVER:
+        default:
             return;
     }