Changeset 2938 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

May 30, 2007 4:30:42 PM (18 years ago)

Author:

vboxsync

Message:

NAT: Pass first entry of search list as domain name in DHCP (which DHCP
clients usually use to populate the DNS search list).

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bootp.c (modified) (1 diff)
• libslirp.h (modified) (1 diff)
• slirp.c (modified) (9 diffs)
• slirp_state.h (modified) (1 diff)

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

@@ -263 +263 @@
             q += val;
         }
+
+        if (pData->pszDomain && pData->fPassDomain)
+        {
+            val = strlen(pData->pszDomain);
+            *q++ = RFC1533_DOMAINNAME;
+            *q++ = val;
+            memcpy(q, pData->pszDomain, val);
+            q += val;
+        }
     }
     *q++ = RFC1533_END;

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

@@ -27 +27 @@
 #endif
 
-int slirp_init(PNATState *, const char *, void *);
+int slirp_init(PNATState *, const char *, bool, void *);
 void slirp_term(PNATState);
 void slirp_link_up(PNATState);

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

@@ -13 +13 @@
 #ifdef _WIN32
 
-static int get_dns_addr(PNATState pData, struct in_addr *pdns_addr)
+static int get_dns_addr_domain(PNATState pData, struct in_addr *pdns_addr,
+                               const char **ppszDomain)
 {
     FIXED_INFO *FixedInfo=NULL;
@@ -20 +21 @@
     IP_ADDR_STRING *pIPAddr;
     struct in_addr tmp_addr;
+
+    *ppszDomain = NULL;
+    /** @todo implement search list for Windows host. */
 
     FixedInfo = (FIXED_INFO *)GlobalAlloc(GPTR, sizeof(FIXED_INFO));
@@ -61 +65 @@
 #else
 
-static int get_dns_addr(PNATState pData, struct in_addr *pdns_addr)
+static int get_dns_addr_domain(PNATState pData, struct in_addr *pdns_addr,
+                               const char **ppszDomain)
 {
     char buff[512];
@@ -92 +97 @@
         return -1;
 
+    *ppszDomain = NULL;
     Log(("nat: IP address of your DNS(s): \n"));
     while (fgets(buff, 512, f) != NULL) {
@@ -108 +114 @@
                 Log(("nat: %s\n", inet_ntoa(tmp_addr)));
         }
+        if (!strncmp(buff, "domain", 6) || !strncmp(buff, "search", 6))
+        {
+            /* Domain name/search list present. Pick first entry */
+            if (*ppszDomain == NULL)
+            {
+                char *tok;
+                tok = strtok(&buff[6], " \t\n");
+                *ppszDomain = RTStrDup(tok);
+                if (pData->fPassDomain)
+                    LogRel(("NAT: passing domain name %s\n", tok));
+                else
+                    Log(("nat: ignoring domain %s\n", tok));
+            }
+        }
     }
     fclose(f);
@@ -117 +137 @@
 #endif
 
-int slirp_init(PNATState *ppData, const char *pszNetAddr, void *pvUser)
+int slirp_init(PNATState *ppData, const char *pszNetAddr, bool fPassDomain, void *pvUser)
 {
     int fNATfailed = 0;
@@ -125 +145 @@
         return VERR_NO_MEMORY;
     memset(pData, '\0', sizeof(NATState));
+    pData->fPassDomain = fPassDomain;
     pData->pvUser = pvUser;
 #if ARCH_BITS == 64
@@ -150 +171 @@
     inet_aton("127.0.0.1", &dns_addr);
 
-    if (get_dns_addr(pData, &dns_addr) < 0)
+    if (get_dns_addr_domain(pData, &dns_addr, &pData->pszDomain) < 0)
         fNATfailed = 1;
 
@@ -193 +214 @@
 void slirp_term(PNATState pData)
 {
+    if (pData->pszDomain)
+        RTStrFree((char *)(void *)pData->pszDomain);
+
 #if ARCH_BITS == 64
     LogRel(("NAT: cpvHashUsed=%RU32 cpvHashCollisions=%RU32 cpvHashInserts=%RU64 cpvHashDone=%RU64\n",

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

@@ -91 +91 @@
     struct ex_list *exec_list;
     char slirp_hostname[33];
+    bool fPassDomain;
+    const char *pszDomain;
     /* Stuff from tcp_input.c */
     struct socket tcb;