Changeset 53242 in vbox

Timestamp:

Nov 5, 2014 4:28:08 PM (10 years ago)

Author:

vboxsync

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

96793

Message:

Main/HostDnsService: Tcpip\Parameters\NameServer value is not updated
when the list of name servers is statically configured, so don't
inspect NameServer and DhcpNameServer directly - instead use
DnsQueryConfig(DnsConfigDnsServerList, ...) from DnsAPI.dll

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• src-server/win/HostDnsServiceWin.cpp (modified) (4 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -328 +328 @@
         socket \
         $(LIB_VMM)
+
+VBoxSVC_LIBS.win += \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/dnsapi.lib
 
 VBoxSVC_INTERMEDIATES = \

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

@@ -25 +25 @@
 
 #include <Windows.h>
+#include <windns.h>
 
 #include <algorithm>
@@ -202 +203 @@
     LONG lrc;
 
-    std::string strNameServer;
     std::string strDomain;
-    std::string strDhcpNameServer;
     std::string strDhcpDomain;
     std::string strSearchList;  /* NB: comma separated, no spaces */
@@ -237 +236 @@
             --cbKeyData;     /* don't count trailing NUL if present */
 
-        if (RTStrICmp("NameServer", keyName) == 0)
-        {
-            strNameServer.assign(keyData, cbKeyData);
-            Log2(("... NameServer=\"%s\"\n", strNameServer.c_str()));
-        }
-        else if (RTStrICmp("Domain", keyName) == 0)
+        if (RTStrICmp("Domain", keyName) == 0)
         {
             strDomain.assign(keyData, cbKeyData);
             Log2(("... Domain=\"%s\"\n", strDomain.c_str()));
         }
-        else if (RTStrICmp("DhcpNameServer", keyName) == 0)
-        {
-            strDhcpNameServer.assign(keyData, cbKeyData);
-            Log2(("... DhcpNameServer=\"%s\"\n", strDhcpNameServer.c_str()));
-        }
         else if (RTStrICmp("DhcpDomain", keyName) == 0)
         {
@@ -266 +255 @@
     HostDnsInformation info;
 
-    if (!strNameServer.empty())
-        vappend(info.servers, strNameServer);
-    else if (!strDhcpNameServer.empty())
-        vappend(info.servers, strDhcpNameServer);
+    /*
+     * When name servers are configured statically it seems that the
+     * value of Tcpip\Parameters\NameServer is NOT set, inly interface
+     * specific NameServer value is (which triggers notification for
+     * us to pick up the change).  Fortunately, DnsApi seems to do the
+     * right thing there.
+     */
+    DNS_STATUS status;
+    PIP4_ARRAY pIp4Array = NULL;
+
+    // NB: must be set on input it seems, despite docs' claim to the contrary.
+    DWORD cbBuffer = sizeof(&pIp4Array);
+
+    status = DnsQueryConfig(DnsConfigDnsServerList,
+                            DNS_CONFIG_FLAG_ALLOC, NULL, NULL,
+                            &pIp4Array, &cbBuffer);
+    
+    if (status == NO_ERROR && pIp4Array != NULL)
+    {
+        for (DWORD i = 0; i < pIp4Array->AddrCount; ++i)
+        {
+            char szAddrStr[16] = "";
+            RTStrPrintf(szAddrStr, sizeof(szAddrStr), "%RTnaipv4", pIp4Array->AddrArray[i]);
+
+            Log2(("  server %d: %s\n", i+1,  szAddrStr));
+            info.servers.push_back(szAddrStr);
+        }
+
+        LocalFree(pIp4Array);
+    }
 
     if (!strDomain.empty())