Changeset 49235 in vbox for trunk/src/VBox/Main/src-server/HostDnsServiceResolvConf.cpp

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

90144

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/HostDnsServiceResolvConf.cpp (modified) (7 diffs)

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

@@ -3 +3 @@
 #include <VBox/com/ptr.h>
 
-#include "HostDnsService.h"
 
 #ifdef RT_OS_OS2
@@ -19 +18 @@
 #include <iprt/err.h>
 #include <iprt/file.h>
+#include <iprt/critsect.h>
 
 #include <VBox/log.h>
+
+#include <string>
+#include <vector>
+
+#include "HostDnsService.h"
+
+
+struct HostDnsServiceResolvConf::Data
+{
+    Data(const char *fileName):resolvConfFilename(fileName){};
+
+    std::string resolvConfFilename;
+};
+
+
+const std::string& HostDnsServiceResolvConf::resolvConf()
+{
+    return m->resolvConfFilename;
+}
 
 
@@ -51 +70 @@
 
 
-HostDnsServiceResolvConf::HostDnsServiceResolvConf(const char* aResolvConfFilename)
+HostDnsServiceResolvConf::~HostDnsServiceResolvConf()
 {
-    m_ResolvConfFilename = com::Utf8Str(aResolvConfFilename);
+    if (m) delete m;
 }
 
 
-HostDnsServiceResolvConf::~HostDnsServiceResolvConf()
+HRESULT HostDnsServiceResolvConf::init(const char *aResolvConfFileName)
 {
-    m_ResolvConfFilename.setNull();
-    RTFileClose(m_ResolvConfFile);
-}
+    HostDnsMonitor::init();
 
-HRESULT HostDnsServiceResolvConf::init(const VirtualBox *aParent)
-{
-    HRESULT hrc;
-
-    int rc = RTFileOpen(&m_ResolvConfFile, m_ResolvConfFilename.c_str(),
-                        RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
-    AssertRCReturn(rc, E_FAIL);
-
-
-    hrc = HostDnsService::init(aParent);
-    AssertComRCReturn(hrc, hrc);
-
-
-
-    hrc = update();
-    AssertComRCReturn(hrc, hrc);
+    m = new Data(aResolvConfFileName);
+    readResolvConf();
 
     return S_OK;
@@ -84 +87 @@
 
 
-HRESULT HostDnsServiceResolvConf::update()
+HRESULT HostDnsServiceResolvConf::readResolvConf()
 {
     char buff[256];
@@ -91 +94 @@
     bool fWarnTooManyDnsServers = false;
     struct in_addr tmp_addr;
-    int rc;
     size_t bytes;
+    HostDnsInformation info;
+    RTFILE resolvConfFile;
 
-    while (    RT_SUCCESS(rc = fileGets(m_ResolvConfFile, buff, sizeof(buff), &bytes))
+    int rc = RTFileOpen(&resolvConfFile, m->resolvConfFilename.c_str(),
+                        RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+    AssertRCReturn(rc, E_FAIL);
+
+    while (    RT_SUCCESS(rc = fileGets(resolvConfFile, buff, sizeof(buff), &bytes))
             && rc != VERR_EOF)
     {
@@ -110 +118 @@
                 continue;
 
-            m_llNameServers.push_back(com::Utf8Str(buff2));
+            info.servers.push_back(std::string(buff2));
 
             cNameserversFound++;
@@ -122 +130 @@
 
             if (tok != NULL)
-                m_DomainName = com::Utf8Str(tok);
+                info.domain = std::string(tok);
         }
     }
 
+    RTFileClose(resolvConfFile);
+
+    setInfo(info);
+
     return S_OK;
-
 }