Changeset 54631 in vbox for trunk/src/VBox/Main/src-server/HostDnsService.cpp

Timestamp:

Mar 4, 2015 4:41:08 PM (10 years ago)

Author:

vboxsync

Message:

Main/HostDnsService: fixed a typo which prevented to pass any DNS server / domain / search string information to the NAT network; cosmetical logging fixes

File:

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

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

@@ -217 +217 @@
     // previous state. Here we have the previous state, so make sure we don't
     // ever tell our clients about unchanged info.
-    if (info.equals(m->info))
+    if (!info.equals(m->info))
     {
         m->info = info;
@@ -294 +294 @@
 
     LogRel(("HostDnsMonitorProxy::GetNameServers:\n"));
-    dumpHostDnsStrVector("Name Server", m->info->servers);
+    dumpHostDnsStrVector("name server", m->info->servers);
 
     detachVectorOfString(m->info->servers, aNameServers);
@@ -309 +309 @@
         updateInfo();
 
-    LogRel(("HostDnsMonitorProxy::GetDomainName: %s\n", m->info->domain.c_str()));
+    LogRel(("HostDnsMonitorProxy::GetDomainName: %s\n",
+            m->info->domain.empty() ? "no domain set" : m->info->domain.c_str()));
 
     *pDomainName = m->info->domain.c_str();
@@ -325 +326 @@
 
     LogRel(("HostDnsMonitorProxy::GetSearchStrings:\n"));
-    dumpHostDnsStrVector("Search String", m->info->searchList);
+    dumpHostDnsStrVector("search string", m->info->searchList);
 
     detachVectorOfString(m->info->searchList, aSearchStrings);
@@ -366 +367 @@
 static void dumpHostDnsInformation(const HostDnsInformation& info)
 {
-    dumpHostDnsStrVector("DNS server", info.servers);
-    dumpHostDnsStrVector("SearchString", info.searchList);
+    dumpHostDnsStrVector("server", info.servers);
+    dumpHostDnsStrVector("search string", info.searchList);
 
     if (!info.domain.empty())
-        LogRel(("DNS domain: %s\n", info.domain.c_str()));
+        LogRel(("  domain: %s\n", info.domain.c_str()));
+    else
+        LogRel(("  no domain set\n"));
 }
 
@@ -380 +383 @@
          it != v.end();
          ++it, ++i)
-        LogRel(("%s %d: %s\n", prefix.c_str(), i, it->c_str()));
-}
+        LogRel(("  %s %d: %s\n", prefix.c_str(), i, it->c_str()));
+    if (v.empty())
+        LogRel(("  no %s entries\n", prefix.c_str()));
+}