Changeset 5716 in vbox for trunk/src/VBox/Devices/Network/slirp/slirp.c

Timestamp:

Nov 12, 2007 5:21:33 PM (17 years ago)

Author:

vboxsync

Message:

Make sure DNS forwarding address is kept current. It can change at
runtime.

File:

• trunk/src/VBox/Devices/Network/slirp/slirp.c (modified) (12 diffs)

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -13 +13 @@
 #ifdef _WIN32
 
-static int get_dns_addr_domain(PNATState pData, struct in_addr *pdns_addr,
+static int get_dns_addr_domain(PNATState pData, bool fVerbose,
+                               struct in_addr *pdns_addr,
                                const char **ppszDomain)
 {
@@ -26 +27 @@
     BufLen = sizeof(FIXED_INFO);
 
+    /** @todo: this API returns all DNS servers, no matter whether the
+     * corresponding network adapter is disabled or not. Maybe replace
+     * this by GetAdapterAddresses(), which is XP/Vista only though. */
     if (ERROR_BUFFER_OVERFLOW == GetNetworkParams(FixedInfo, &BufLen)) {
         if (FixedInfo) {
@@ -46 +50 @@
     pIPAddr = &(FixedInfo->DnsServerList);
     inet_aton(pIPAddr->IpAddress.String, &tmp_addr);
+    Log(("nat: DNS Servers:\n"));
+    if (fVerbose || pdns_addr->s_addr != tmp_addr.s_addr)
+        LogRel(("NAT: DNS address: %s\n", pIPAddr->IpAddress.String));
     *pdns_addr = tmp_addr;
-    Log(("nat: DNS Servers:\n"));
-    LogRel(("NAT: DNS address: %s\n", pIPAddr->IpAddress.String));
 
     pIPAddr = FixedInfo -> DnsServerList.Next;
     while ( pIPAddr )
     {
-        LogRel(("NAT: ignored DNS address: %s\n", pIPAddr ->IpAddress.String));
+        if (fVerbose)
+            LogRel(("NAT: ignored DNS address: %s\n", pIPAddr ->IpAddress.String));
         pIPAddr = pIPAddr ->Next;
     }
@@ -62 +68 @@
 
 get_dns_prefix:
-    *ppszDomain = NULL;
+    if (ppszDomain)
     {
         OSVERSIONINFO ver;
@@ -68 +74 @@
         DWORD dwSize = sizeof(szDnsDomain);
 
+        *ppszDomain = NULL;
         GetVersionEx(&ver);
         if (ver.dwMajorVersion >= 5)
@@ -79 +86 @@
                     *ppszDomain = RTStrDup(szDnsDomain);
                     if (pData->fPassDomain)
-                        LogRel(("NAT: passing domain name %s\n", szDnsDomain));
+                    {
+                        if (fVerbose)
+                            LogRel(("NAT: passing domain name %s\n", szDnsDomain));
+                    }
                     else
                         Log(("nat: ignoring domain %s\n", szDnsDomain));
@@ -93 +103 @@
 #else
 
-static int get_dns_addr_domain(PNATState pData, struct in_addr *pdns_addr,
+static int get_dns_addr_domain(PNATState pData, bool fVerbose,
+                               struct in_addr *pdns_addr,
                                const char **ppszDomain)
 {
@@ -125 +136 @@
         return -1;
 
-    *ppszDomain = NULL;
+    if (ppszDomain)
+        *ppszDomain = NULL;
     Log(("nat: DNS Servers:\n"));
     while (fgets(buff, 512, f) != NULL) {
@@ -136 +148 @@
             if (!found)
             {
+                if (fVerbose || pdns_addr->s_addr != tmp_addr.s_addr)
+                    LogRel(("NAT: DNS address: %s\n", buff2));
                 *pdns_addr = tmp_addr;
-                LogRel(("NAT: DNS address: %s\n", buff2));
             }
             else
-                LogRel(("NAT: ignored DNS address: %s\n", buff2));
+            {
+                if (fVerbose)
+                    LogRel(("NAT: ignored DNS address: %s\n", buff2));
+            }
             found++;
         }
-        if (!strncmp(buff, "domain", 6) || !strncmp(buff, "search", 6))
+        if (   ppszDomain
+            && (!strncmp(buff, "domain", 6) || !strncmp(buff, "search", 6)))
         {
             /* Domain name/search list present. Pick first entry */
@@ -149 +166 @@
             {
                 char *tok;
-                tok = strtok(&buff[6], " \t\n");
+                char *saveptr;
+                tok = strtok_r(&buff[6], " \t\n", &saveptr);
                 if (tok)
                 {
                     *ppszDomain = RTStrDup(tok);
                     if (pData->fPassDomain)
-                        LogRel(("NAT: passing domain name %s\n", tok));
+                    {
+                        if (fVerbose)
+                            LogRel(("NAT: passing domain name %s\n", tok));
+                    }
                     else
                         Log(("nat: ignoring domain %s\n", tok));
@@ -168 +189 @@
 
 #endif
+
+int get_dns_addr(PNATState pData, struct in_addr *pdns_addr)
+{
+    return get_dns_addr_domain(pData, false, pdns_addr, NULL);
+}
 
 int slirp_init(PNATState *ppData, const char *pszNetAddr, bool fPassDomain,
@@ -207 +233 @@
     inet_aton("127.0.0.1", &dns_addr);
 
-    if (get_dns_addr_domain(pData, &dns_addr, &pData->pszDomain) < 0)
+    if (get_dns_addr_domain(pData, true, &dns_addr, &pData->pszDomain) < 0)
         fNATfailed = 1;