Changeset 71203 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 5, 2018 3:47:29 PM (7 years ago)

Author:

vboxsync

Message:

NAT: Redo previous. Explicitly map nameserver 0.0.0.0 to loopback
first and let existing code remap it instead of duplicating that code.

File:

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

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

@@ -179 +179 @@
         struct dns_entry *pDns;
         RTNETADDRU *address = &st.rcps_nameserver[i].uAddr;
+
+        if (address->IPv4.u == INADDR_ANY)
+        {
+            /*
+             * This doesn't seem to be very well documented except for
+             * RTFS of res_init.c, but INADDR_ANY is a valid value for
+             * for "nameserver".
+             */
+            address->IPv4.u = RT_H2N_U32_C(INADDR_LOOPBACK);
+        }
+
         if (  (address->IPv4.u & RT_H2N_U32_C(IN_CLASSA_NET))
            == RT_N2H_U32_C(INADDR_LOOPBACK & IN_CLASSA_NET))
@@ -194 +205 @@
             }
         }
-        else if (address->IPv4.u == INADDR_ANY)
-        {
-            /*
-             * This doesn't seem to be very well documented except for
-             * RTFS of res_init.c, but INADDR_ANY is a valid value for
-             * for "nameserver".
-             */
-            address->IPv4.u = pData->special_addr.s_addr | RT_H2N_U32_C(CTL_ALIAS);
-        }
 
         pDns = RTMemAllocZ(sizeof(struct dns_entry));