Changeset 16296 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Jan 28, 2009 10:55:06 AM (16 years ago)

Author:

vboxsync

Message:

NAT: Enbaled multi dns on Linux.

File:

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

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

@@ -163 +163 @@
     IP_ADDR_STRING *pIPAddr;
     struct in_addr tmp_addr;
-#ifdef VBOX_WITH_MULTI_DNS
-    struct in_addr local_mask;
-    struct in_addr local_network;
-#endif
 
     FixedInfo = (FIXED_INFO *)GlobalAlloc(GPTR, sizeof(FIXED_INFO));
@@ -213 +209 @@
 #else
     /*localhost mask */
-    inet_aton("255.0.0.0", &local_mask);
-    inet_aton("127.0.0.0", &local_network);
     for (pIPAddr = &FixedInfo->DnsServerList; pIPAddr != NULL; pIPAddr = pIPAddr->Next)
     {
-        struct dns_entry *da = RTMemAllocZ(sizeof (struct dns_entry));
+        struct dns_entry *da;
+        if(!inet_aton(pIPAddr->IpAddress.String, &tmp_addr))
+            continue;
+        da = RTMemAllocZ(sizeof (struct dns_entry));
         if (da == NULL)
         {
@@ -224 +221 @@
         }
         /*check */
-        inet_aton(pIPAddr->IpAddress.String, &da->de_addr);
-        if ((ntohl(da->de_addr.s_addr) & ntohl(local_mask.s_addr)) == ntohl(local_network.s_addr)) {
+        if ((da->de_addr.s_addr & htonl(IN_CLASSA_NET)) == ntohl(INADDR_LOOPBACK & IN_CLASSA_NET)) {
             da->de_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS);
         }
@@ -313 +309 @@
     while (fgets(buff, 512, f) != NULL)
     {
+#ifdef VBOX_WITH_MULTI_DNS
+        struct dns_entry *da = NULL;
+#endif
         if (sscanf(buff, "nameserver%*[ \t]%256s", buff2) == 1)
         {
             if (!inet_aton(buff2, &tmp_addr))
                 continue;
+#ifndef VBOX_WITH_MULTI_DNS
             /* If it's the first one, set it to dns_addr */
             if (!found)
@@ -329 +329 @@
                     LogRel(("NAT: ignored DNS address: %s\n", buff2));
             }
+#else
+    /*localhost mask */
+            da = RTMemAllocZ(sizeof (struct dns_entry));
+            if (da == NULL)
+            {
+                LogRel(("can't alloc memory for DNS entry\n"));
+                return -1;
+            }
+            /*check */
+            da->de_addr.s_addr = tmp_addr.s_addr;
+            if ((da->de_addr.s_addr & htonl(IN_CLASSA_NET)) == ntohl(INADDR_LOOPBACK & IN_CLASSA_NET)) {
+                da->de_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS);
+            }
+            LIST_INSERT_HEAD(&pData->dns_list_head, da, de_list);
+#endif
             found++;
         }