Changeset 49235 in vbox for trunk/src/VBox/Main/src-server/win

Timestamp:

Oct 22, 2013 6:56:03 PM (11 years ago)

Author:

vboxsync

Message:

Main/HostDnsService: splits HostDnsService on "singleton" HostDnsMonitor
which monitors host changes and share DnsInformation to per HostImpl/VirtualBoxImpl objects
HostDnsMonitorProxy.

TODO: Win/Darwin parts might burn (not tested)
TODO: find good place to call HostDnsMonitor::shutdown() to stop
monitoring thread. (ref counting could be used on
HostDnsMonitor::addMonitorProxy and HostDnsMonitor::releaseMonitorProxy,
but it better to pausing monitoring on no --auto-shutdown launches of VBoxSVC).

File:

• trunk/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp (modified) (6 diffs)

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

@@ -30 +30 @@
 
 
-HRESULT HostDnsServiceWin::init(const VirtualBox *aParent)
+HRESULT HostDnsServiceWin::init()
 {
-    HRESULT hrc;
-    hrc = HostDnsService::init(aParent);
+    HRESULT hrc = HostDnsMonitor::init(aParent);
     AssertComRCReturn(hrc, hrc);
 
@@ -40 +39 @@
 
     return S_OK;
-}
-
-
-HRESULT HostDnsServiceWin::start(void)
-{
-    return S_OK;
-}
-
-
-void HostDnsServiceWin::stop(void)
-{
 }
 
@@ -61 +49 @@
     BYTE abNameServers[256];
     BYTE abSearchList[256];
-
-    m_llNameServers.clear();
-    m_llSearchStrings.clear();
-    m_DomainName.setNull();
-
-    RT_ZERO(abDomain);
-    RT_ZERO(abNameServers);
-    RT_ZERO(abSearchList);
 
     regIndex = 0;
@@ -115 +95 @@
     /* OK, now parse and update DNS structures. */
     /* domain name */
-    m_DomainName = com::Utf8Str((char *)abDomain);
+    HostDnsInformation info;
+    info.domain = static_cast<char*>(abDomain);
+
     /* server list */
-    strList2List(m_llNameServers, (char *)abNameServers);
+    strList2List(info.servers, static_cast<char *>(abNameServers));
     /* search list */
-    strList2List(m_llSearchStrings, (char *)abNameServers);
+    strList2List(info.searchList, static_cast<char *>(abSearchList));
+
+    setInfo(info);
 
     return S_OK;
@@ -126 +110 @@
 
 
-void HostDnsServiceWin::strList2List(Utf8StrList& lst, char *strLst)
+void HostDnsServiceWin::strList2List(std::vector<std::string>& lst, char *strLst)
 {
     char *next, *current;
@@ -146 +130 @@
           strcpy(address, current);
 
-        lst.push_back(com::Utf8Str(address));
+        lst.push_back(std::string(address));
 
         current = next + 1;