Changeset 48056 in vbox for trunk/src/VBox

Timestamp:

Aug 26, 2013 10:31:27 AM (11 years ago)

Author:

vboxsync

Message:

DrvNAT: Watch for DNS server changes on OS X and force a reconnect

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• Network/DrvNAT.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -193 +193 @@
         -framework IOKit \
         -framework Carbon \
-        -framework DiskArbitration
+        -framework DiskArbitration \
+        -framework SystemConfiguration
  VBoxDD_LDFLAGS.linux    = -Wl,--no-undefined
 

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

@@ -52 +52 @@
 #include <iprt/semaphore.h>
 #include <iprt/req.h>
+#ifdef RT_OS_DARWIN
+# include <SystemConfiguration/SystemConfiguration.h>
+# include <CoreFoundation/CoreFoundation.h>
+#endif
 
 #define COUNTERS_INIT
@@ -197 +201 @@
     /** Transmit lock taken by BeginXmit and released by EndXmit. */
     RTCRITSECT              XmitLock;
+
+#ifdef RT_OS_DARWIN
+    /* Handle of the DNS watcher runloop source. */
+    CFRunLoopSourceRef      hRunLoopSrcDnsWatcher;
+#endif
 } DRVNAT;
 AssertCompileMemberAlignment(DRVNAT, StatNATRecvWakeups, 8);
@@ -940 +949 @@
 
 
+#ifdef RT_OS_DARWIN
+/**
+ * Callback for the SystemConfiguration framework to notify us whenever the DNS
+ * server changes.
+ *
+ * @returns nothing.
+ * @param   hDynStor    The DynamicStore handle.
+ * @param   hChangedKey Array of changed keys we watch for.
+ * @param   pvUser      Opaque user data (NAT driver instance).
+ */
+static DECLCALLBACK(void) drvNatDnsChanged(SCDynamicStoreRef hDynStor, CFArrayRef hChangedKeys, void *pvUser)
+{
+    PDRVNAT pThis = (PDRVNAT)pvUser;
+
+    pThis->pIAboveConfig->pfnSetLinkState(pThis->pIAboveConfig, PDMNETWORKLINKSTATE_DOWN_RESUME);
+}
+#endif
+
 /**
  * @interface_method_impl{PDMIBASE,pfnQueryInterface}
@@ -1010 +1037 @@
              * 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
             return;
         default: /* Ignore every other resume reason. */
@@ -1203 +1232 @@
     if (RTCritSectIsInitialized(&pThis->XmitLock))
         RTCritSectDelete(&pThis->XmitLock);
+
+#ifdef RT_OS_DARWIN
+    /* Cleanup the DNS watcher. */
+    CFRunLoopRef hRunLoopMain = CFRunLoopGetMain();
+    CFRetain(hRunLoopMain);
+    CFRunLoopRemoveSource(hRunLoopMain, pThis->hRunLoopSrcDnsWatcher, kCFRunLoopCommonModes);
+    CFRelease(hRunLoopMain);
+    CFRelease(pThis->hRunLoopSrcDnsWatcher);
+    pThis->hRunLoopSrcDnsWatcher = NULL;
+#endif
 }
 
@@ -1229 +1268 @@
     pThis->EventRecv                    = NIL_RTSEMEVENT;
     pThis->EventUrgRecv                 = NIL_RTSEMEVENT;
+#ifdef RT_OS_DARWIN
+    pThis->hRunLoopSrcDnsWatcher        = NULL;
+#endif
 
     /* IBase */
@@ -1436 +1478 @@
 
             pThis->enmLinkState = pThis->enmLinkStateWant = PDMNETWORKLINKSTATE_UP;
+
+#ifdef RT_OS_DARWIN
+            /* Set up a watcher which notifies us everytime the DNS server changes. */
+            int rc2 = VINF_SUCCESS;
+            SCDynamicStoreContext SCDynStorCtx;
+
+            SCDynStorCtx.version = 0;
+            SCDynStorCtx.info = pThis;
+            SCDynStorCtx.retain = NULL;
+            SCDynStorCtx.release = NULL;
+            SCDynStorCtx.copyDescription = NULL;
+
+            SCDynamicStoreRef hDynStor = SCDynamicStoreCreate(NULL, CFSTR("org.virtualbox.drvnat"), drvNatDnsChanged, &SCDynStorCtx);
+            if (hDynStor)
+            {
+                CFRunLoopSourceRef hRunLoopSrc = SCDynamicStoreCreateRunLoopSource(NULL, hDynStor, 0);
+                if (hRunLoopSrc)
+                {
+                    CFStringRef aWatchKeys[] =
+                    {
+                        CFSTR("State:/Network/Global/DNS")
+                    };
+                    CFArrayRef hArray = CFArrayCreate(NULL, (const void **)aWatchKeys, 1, &kCFTypeArrayCallBacks);
+
+                    if (hArray)
+                    {
+                        if (SCDynamicStoreSetNotificationKeys(hDynStor, hArray, NULL))
+                        {
+                            CFRunLoopRef hRunLoopMain = CFRunLoopGetMain();
+                            CFRetain(hRunLoopMain);
+                            CFRunLoopAddSource(hRunLoopMain, hRunLoopSrc, kCFRunLoopCommonModes);
+                            CFRelease(hRunLoopMain);
+                            pThis->hRunLoopSrcDnsWatcher = hRunLoopSrc;
+                        }
+                        else
+                            rc2 = VERR_NO_MEMORY;
+
+                        CFRelease(hArray);
+                    }
+                    else
+                        rc2 = VERR_NO_MEMORY;
+
+                    if (RT_FAILURE(rc2)) /* Keep the runloop source referenced for destruction. */
+                        CFRelease(hRunLoopSrc);
+                }
+                CFRelease(hDynStor);
+            }
+            else
+                rc2 = VERR_NO_MEMORY;
+
+            if (RT_FAILURE(rc2))
+                LogRel(("NAT#%d: Failed to install DNS change notifier. The guest might loose DNS access when switching networks on the host\n",
+                         pDrvIns->iInstance));
+#endif
 
             /* might return VINF_NAT_DNS */