Changeset 78030 in vbox

Timestamp:

Apr 5, 2019 7:08:10 PM (6 years ago)

Author:

vboxsync

Message:

Main/HostDnsServiceDarwin: Preliminary fix to make VBoxSVC start on MacOS again; more work needed in that area, code still is too convoluted.

Location:

trunk/src/VBox/Main/src-server

Files:

• HostDnsService.h (modified) (1 diff)
• darwin/HostDnsServiceDarwin.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-server/HostDnsService.h

@@ -154 +154 @@
 private:
 
-    HRESULT updateInfo();
+    int updateInfo(void);
     static void hostDnsServiceStoreCallback(void *store, void *arrayRef, void *info);
     struct Data;

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

@@ -66 +66 @@
 HRESULT HostDnsServiceDarwin::init(HostDnsMonitorProxy *pProxy)
 {
-    HRESULT hrc = HostDnsServiceBase::init(pProxy);
-    AssertComRCReturn(hrc, hrc);
-
     SCDynamicStoreContext ctx;
     RT_ZERO(ctx);
@@ -96 +93 @@
     CFRunLoopAddSource(m->m_RunLoopRef, m->m_SourceStop, kCFRunLoopCommonModes);
 
-    return updateInfo();
+    HRESULT hrc = HostDnsServiceBase::init(pProxy);
+    return hrc;
 }
 
@@ -143 +141 @@
     {
         CFRelease(m->m_DnsWatcher);
-        return E_OUTOFMEMORY;
+        return VERR_NO_MEMORY;
     }
 
@@ -153 +151 @@
     onMonitorThreadInitDone();
 
+    /* Trigger initial update. */
+    int rc = updateInfo();
+    AssertRC(rc); /* Not fatal in release builds. */
+
     while (!ASMAtomicReadBool(&m->m_fStop))
     {
@@ -164 +166 @@
 }
 
-HRESULT HostDnsServiceDarwin::updateInfo(void)
+int HostDnsServiceDarwin::updateInfo(void)
 {
     CFPropertyListRef propertyRef = SCDynamicStoreCopyValue(m->m_store, kStateNetworkGlobalDNSKey);
@@ -186 +188 @@
 
     if (!propertyRef)
-        return S_OK;
+        return VINF_SUCCESS;
 
     HostDnsInformation info;
@@ -245 +247 @@
     setInfo(info);
 
-    return S_OK;
-}
-
-void HostDnsServiceDarwin::hostDnsServiceStoreCallback(void *, void *, void *info)
-{
-    HostDnsServiceDarwin *pThis = (HostDnsServiceDarwin *)info;
+    return VINF_SUCCESS;
+}
+
+void HostDnsServiceDarwin::hostDnsServiceStoreCallback(void *, void *, void *pInfo)
+{
+    HostDnsServiceDarwin *pThis = (HostDnsServiceDarwin *)pInfo;
+    AssertPtrReturnVoid(pThis);
 
     RTCLock grab(pThis->m_LockMtx);
@@ -258 +261 @@
 void HostDnsServiceDarwin::Data::performShutdownCallback(void *pInfo)
 {
-    HostDnsServiceDarwin::Data *pThis = static_cast<HostDnsServiceDarwin::Data *>(pInfo);
+    HostDnsServiceDarwin *pThis = (HostDnsServiceDarwin *)pInfo;
     AssertPtrReturnVoid(pThis);
-    pThis->m_fStop = true;
-}
-
+
+    AssertPtrReturnVoid(pThis->m);
+    ASMAtomicXchgBool(&pThis->m->m_fStop, true);
+}
+