Changeset 48805 in vbox

Timestamp:

Oct 2, 2013 5:16:26 AM (11 years ago)

Author:

vboxsync

Message:

Main: HostDnsServiceWin::init(void) -> HostDnsServiceWin::init(const VirtualBox *aParent) and firing event on update.

Location:

trunk/src/VBox/Main/src-server

Files:

• HostDnsService.cpp (modified) (3 diffs)
• HostDnsService.h (modified) (6 diffs)
• HostDnsServiceResolvConf.cpp (modified) (2 diffs)
• HostImpl.cpp (modified) (1 diff)
• darwin/HostDnsServiceDarwin.cpp (modified) (3 diffs)
• win/HostDnsServiceWin.cpp (modified) (1 diff)

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

@@ -20 +20 @@
 #include <VBox/com/string.h>
 
+#include <iprt/cpp/utils.h>
+
+#include "VirtualBoxImpl.h"
 #include "HostDnsService.h"
 #include <iprt/thread.h>
@@ -33 +36 @@
 
 
-HRESULT HostDnsService::init (void) 
+HRESULT HostDnsService::init(const VirtualBox *aParent) 
 {
+    mParent = aParent;
+    
     int rc = RTCritSectInit(&m_hCritSect);
     AssertRCReturn(rc, E_FAIL);
@@ -51 +56 @@
 HRESULT HostDnsService::update()
 {
+    unconst(mParent)->onHostNameResolutionConfigurationChange();
     return S_OK;
 }

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

@@ -18 +18 @@
 #ifndef ___H_DNSHOSTSERVICE
 #define ___H_DNSHOSTSERVICE
+#include "VirtualBoxBase.h"
 
 #include <iprt/cdefs.h>
@@ -34 +35 @@
     HostDnsService();
     virtual ~HostDnsService();
-    virtual HRESULT init(void);
+    virtual HRESULT init(const VirtualBox *aParent);
     virtual HRESULT start(void);
     virtual void stop(void);
@@ -46 +47 @@
     Utf8StrList     m_llNameServers;
     Utf8StrList     m_llSearchStrings;
-    com::Utf8Str        m_DomainName;
+    com::Utf8Str    m_DomainName;
     RTCRITSECT      m_hCritSect;
 
 private:
+    const VirtualBox *mParent;
     HostDnsService(const HostDnsService& service){ NOREF(service); }
     HostDnsService& operator =(const HostDnsService& service){ NOREF(service); return *this; }
@@ -61 +63 @@
     virtual ~HostDnsServiceDarwin();
 
-    virtual HRESULT init(void);
+    virtual HRESULT init(const VirtualBox *aParent);
     virtual HRESULT start(void);
     virtual void stop(void);
@@ -78 +80 @@
     virtual ~HostDnsServiceWin();
 
-    virtual HRESULT init(void);
+    virtual HRESULT init(const VirtualBox *aParent);
     virtual HRESULT start(void);
     virtual void stop(void);
@@ -94 +96 @@
     HostDnsServiceResolvConf(const char *aResolvConfFileName = "/etc/resolv.conf");
     virtual ~HostDnsServiceResolvConf();
-    virtual HRESULT init(void);
+    virtual HRESULT init(VirtualBox *aParent);
     virtual HRESULT update();
 protected:

trunk/src/VBox/Main/src-server/HostDnsServiceResolvConf.cpp

@@ -63 +63 @@
 }
 
-HRESULT HostDnsServiceResolvConf::init()
+HRESULT HostDnsServiceResolvConf::init(const VirtualBox *aParent)
 {
     HRESULT hrc;
@@ -72 +72 @@
 
 
-    hrc = HostDnsService::init();
+    hrc = HostDnsService::init(aParent);
     AssertComRCReturn(hrc, hrc);
 

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -306 +306 @@
 # endif
 
-    hrc = m->pHostDnsService->init();
+    hrc = m->pHostDnsService->init(m->pParent);
     AssertComRCReturn(hrc, hrc);
 

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

@@ -89 +89 @@
 }
 
-HRESULT HostDnsServiceDarwin::init()
+HRESULT HostDnsServiceDarwin::init(const VirtualBox *aParent)
 {
     SCDynamicStoreContext ctx;
@@ -105 +105 @@
         return E_OUTOFMEMORY;
 
-    HRESULT hrc = HostDnsService::init();
+    HRESULT hrc = HostDnsService::init(aParent);
     AssertComRCReturn(hrc, hrc);
 
@@ -218 +218 @@
 
     CFRelease(propertyRef);
+    this->HostDnsService::update();
+
     return S_OK;
 }

trunk/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp

@@ -30 +30 @@
 
 
-HRESULT HostDnsServiceWin::init(void)
+HRESULT HostDnsServiceWin::init(const VirtualBox *aParent)
 {
     HRESULT hrc;
-    hrc = HostDnsService::init();
+    hrc = HostDnsService::init(aParent);
     AssertComRCReturn(hrc, hrc);