Changeset 23158 in vbox for trunk/src

Timestamp:

Sep 19, 2009 7:19:33 PM (15 years ago)

Author:

vboxsync

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

52575

Message:

NAT: UseHostResolver extradata was introduced
and its relations with PassDomain and UseDNSProxy
have been clarified.

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (3 diffs)
• slirp/bootp.c (modified) (2 diffs)
• slirp/libslirp.h (modified) (1 diff)
• slirp/slirp.c (modified) (6 diffs)
• slirp/slirp_state.h (modified) (1 diff)
• slirp/udp.c (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -805 +805 @@
     if (!CFGMR3AreValuesValid(pCfgHandle,
                               "PassDomain\0TFTPPrefix\0BootFile\0Network"
-                              "\0NextServer\0DNSProxy\0BindIP\0"
+                              "\0NextServer\0DNSProxy\0BindIP\0UseHostResolver\0"
                               "SocketRcvBuf\0SocketSndBuf\0TcpRcvSpace\0TcpSndSpace\0"))
         return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
@@ -839 +839 @@
     int fDNSProxy = 0;
     GET_S32(rc, pThis, pCfgHandle, "DNSProxy", fDNSProxy);
+    int fUseHostResolver = 0;
+    GET_S32(rc, pThis, pCfgHandle, "UseHostResolver", fUseHostResolver);
 
     /*
@@ -880 +882 @@
      * Initialize slirp.
      */
-    rc = slirp_init(&pThis->pNATState, &szNetAddr[0], Netmask, fPassDomain, pThis);
+    rc = slirp_init(&pThis->pNATState, &szNetAddr[0], Netmask, fPassDomain, !!fUseHostResolver, pThis);
     if (RT_SUCCESS(rc))
     {

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

@@ -270 +270 @@
     FILL_BOOTP_EXT(q, RFC1533_GATEWAY, 4, &saddr);
     
-    if (pData->use_dns_proxy)
+    if (pData->use_dns_proxy || pData->use_host_resolver)
     {
         uint32_t addr = htonl(ntohl(special_addr.s_addr) | CTL_DNS);
@@ -298 +298 @@
             FILL_BOOTP_EXT(q, RFC1533_DOMAINNAME, 1, " "); 
     }
-    if (pData->fPassDomain)
+    if (pData->fPassDomain && !pData->use_host_resolver)
     {
         LIST_FOREACH(dd, &pData->dns_domain_list_head, dd_list)

trunk/src/VBox/Devices/Network/slirp/libslirp.h

@@ -29 +29 @@
 
 #ifndef VBOX_WITH_NAT_SERVICE
-int slirp_init(PNATState *, const char *, uint32_t, bool, void *);
+int slirp_init(PNATState *, const char *, uint32_t, bool, bool, void *);
 #else
 int slirp_init(PNATState *, uint32_t, uint32_t, bool, void *);

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

@@ -503 +503 @@
 #ifndef VBOX_WITH_NAT_SERVICE
 int slirp_init(PNATState *ppData, const char *pszNetAddr, uint32_t u32Netmask,
-               bool fPassDomain, void *pvUser)
+               bool fPassDomain, bool fUseHostResolver, void *pvUser)
 #else
 int slirp_init(PNATState *ppData, uint32_t u32NetAddr, uint32_t u32Netmask,
@@ -518 +518 @@
         /* CTL is x.x.x.15, bootp passes up to 16 IPs (15..31) */
         return VERR_INVALID_PARAMETER;
-    pData->fPassDomain = fPassDomain;
+    pData->fPassDomain = !fUseHostResolver ? fPassDomain : false;
+    pData->use_host_resolver = fUseHostResolver;
     pData->pvUser = pvUser;
     pData->netmask = u32Netmask;
@@ -573 +574 @@
     /* set default addresses */
     inet_aton("127.0.0.1", &loopback_addr);
-    if (slirp_init_dns_list(pData) < 0)
-        fNATfailed = 1;
-
-#ifndef VBOX_WITH_SLIRP_BSD_MBUF
-    dnsproxy_init(pData);
-#endif
+    if (!pData->use_host_resolver)
+    {
+        if (slirp_init_dns_list(pData) < 0)
+            fNATfailed = 1;
+
+        dnsproxy_init(pData);
+    }
 
     getouraddr(pData);
@@ -600 +602 @@
         ftp_alias_load(pData);
         nbt_alias_load(pData);
-        dns_alias_load(pData);
+        if (pData->use_host_resolver)
+            dns_alias_load(pData);
     }
     return fNATfailed ? VINF_NAT_DNS : VINF_SUCCESS;
@@ -679 +682 @@
     ftp_alias_unload(pData);
     nbt_alias_unload(pData);
-    dns_alias_unload(pData);
+    if (pData->use_host_resolver)
+        dns_alias_unload(pData);
     while(!LIST_EMPTY(&instancehead)) 
     {
@@ -1890 +1894 @@
 void slirp_set_dhcp_dns_proxy(PNATState pData, bool fDNSProxy)
 {
-    Log2(("NAT: DNS proxy switched %s\n", (fDNSProxy ? "on" : "off")));
-    pData->use_dns_proxy = fDNSProxy;
+    if (!pData->use_host_resolver)
+    {
+        Log2(("NAT: DNS proxy switched %s\n", (fDNSProxy ? "on" : "off")));
+        pData->use_dns_proxy = fDNSProxy;
+    } 
+    else
+    {
+        LogRel(("NAT: Host Resolver conflicts with DNS proxy, the last one was forcely ignored\n"));
+    }
 }
 

trunk/src/VBox/Devices/Network/slirp/slirp_state.h

@@ -261 +261 @@
     uma_zone_t zone_ext_refcnt;
 #endif
-
+    int use_host_resolver; 
     /* from dnsproxy/dnsproxy.h*/
     unsigned int authoritative_port;

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

@@ -257 +257 @@
      * DNS proxy
      */
-#if 0
-    if (   (ip->ip_dst.s_addr == htonl(ntohl(special_addr.s_addr) | CTL_DNS))
+    if (   pData->use_dns_proxy
+        && (ip->ip_dst.s_addr == htonl(ntohl(special_addr.s_addr) | CTL_DNS))
         && (ntohs(uh->uh_dport) == 53)) 
     {
@@ -264 +264 @@
         goto done;
     }
-#endif
 
     iphlen += sizeof(struct udphdr);