Changeset 48486 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Sep 16, 2013 2:57:58 PM (11 years ago)

Author:

vboxsync

Message:

HostDnsServiceDarwin: listener for host's DNS configuration update.

File:

• trunk/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp

@@ -22 +22 @@
 
 #include <iprt/err.h>
+#include <iprt/thread.h>
+#include <iprt/semaphore.h>
 
 #include <CoreFoundation/CoreFoundation.h>
@@ -30 +32 @@
 SCDynamicStoreRef g_store;
 CFRunLoopSourceRef g_DnsWatcher;
+CFRunLoopRef g_RunLoopRef;
+RTTHREAD g_DnsMonitoringThread;
+RTSEMEVENT g_DnsInitEvent;
 
 static const CFStringRef kStateNetworkGlobalDNSKey = CFSTR("State:/Network/Global/DNS");
+
+static int hostMonitoringRoutine(RTTHREAD ThreadSelf, void *pvUser)
+{
+    g_RunLoopRef = CFRunLoopGetCurrent();
+    AssertReturn(g_RunLoopRef, VERR_INTERNAL_ERROR);
+
+    CFRetain(g_RunLoopRef);
+
+    CFArrayRef watchingArrayRef = CFArrayCreate(NULL, 
+                                                (const void **)&kStateNetworkGlobalDNSKey, 
+                                                1, &kCFTypeArrayCallBacks);
+    if (!watchingArrayRef)
+    {
+        CFRelease(g_DnsWatcher);
+        return E_OUTOFMEMORY;
+    }
+
+    if(SCDynamicStoreSetNotificationKeys(g_store, watchingArrayRef, NULL))
+        CFRunLoopAddSource(CFRunLoopGetCurrent(), g_DnsWatcher, kCFRunLoopCommonModes);
+
+    CFRelease(watchingArrayRef);
+
+    RTSemEventSignal(g_DnsInitEvent);
+
+    CFRunLoopRun();
+
+    CFRelease(g_RunLoopRef);
+}
 
 HostDnsServiceDarwin::HostDnsServiceDarwin(){}
@@ -68 +101 @@
         return E_OUTOFMEMORY;
 
-    CFArrayRef watchingArrayRef = CFArrayCreate(NULL, 
-                                                (const void **)&kStateNetworkGlobalDNSKey, 
-                                                1, &kCFTypeArrayCallBacks);
-    if (!watchingArrayRef)
-    {
-        CFRelease(g_DnsWatcher);
-        return E_OUTOFMEMORY;
-    }
-
-    if(SCDynamicStoreSetNotificationKeys(g_store, watchingArrayRef, NULL))
-        CFRunLoopAddSource(CFRunLoopGetMain(), g_DnsWatcher, kCFRunLoopCommonModes);
-
-    CFRelease(watchingArrayRef);
-
     HRESULT hrc = HostDnsService::init();
     AssertComRCReturn(hrc, hrc);
+
+    int rc = RTSemEventCreate(&g_DnsInitEvent);
+    AssertRCReturn(rc, E_FAIL);
     
     return update();
@@ -92 +114 @@
 HRESULT HostDnsServiceDarwin::start()
 {
+    int rc = RTThreadCreate(&g_DnsMonitoringThread, hostMonitoringRoutine,
+                            this, 128 * _1K, RTTHREADTYPE_IO, 0, "dns-monitor");
+    AssertRCReturn(rc, E_FAIL);
+
+    RTSemEventWait(g_DnsInitEvent, RT_INDEFINITE_WAIT);
+
     return S_OK;
 }
@@ -98 +126 @@
 void HostDnsServiceDarwin::stop()
 {
+
+    if (g_RunLoopRef)
+        CFRunLoopStop(g_RunLoopRef);
 }