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

Timestamp:

Jan 26, 2009 1:05:01 PM (16 years ago)

Author:

vboxsync

Message:

NAT:

1. DNS several DNS servers could be passed to guest now (with VBOX_WITH_MULTI_DNS)
2. on host server (if it registered) aliased with CTL_ALIAS, there are no reason use CTL_DNS for this puposes anymore, instead it could be used for built-in DNS if it will require.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bootp.c (modified) (2 diffs)
• ip_icmp.c (modified) (1 diff)
• slirp.c (modified) (4 diffs)
• slirp.h (modified) (2 diffs)
• slirp_state.h (modified) (2 diffs)
• socket.c (modified) (2 diffs)
• tcp_subr.c (modified) (2 diffs)

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

@@ -270 +270 @@
          || dhcp_msg_type == DHCPREQUEST))
     {
+#ifdef VBOX_WITH_MULTI_DNS
+        struct dns_entry *de = NULL;
+#endif
         uint32_t lease_time = htonl(LEASE_TIME);
         uint32_t netmask = htonl(pData->netmask);
@@ -276 +279 @@
         FILL_BOOTP_EXT(q, RFC1533_GATEWAY, 4, &saddr.sin_addr);
 
+#ifndef VBOX_WITH_MULTI_DNS
         dns_addr_dhcp.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_DNS);
         FILL_BOOTP_EXT(q, RFC1533_DNS, 4, &dns_addr_dhcp.s_addr);
+#else
+        LIST_FOREACH(de, &pData->dns_list_head, de_list)
+        {
+            FILL_BOOTP_EXT(q, RFC1533_DNS, 4, &de->de_addr.s_addr);
+        }
+#endif
 
         FILL_BOOTP_EXT(q, RFC2132_LEASE_TIME, 4, &lease_time);

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

@@ -356 +356 @@
                     {
                         case CTL_DNS:
+#ifndef VBOX_WITH_MULTI_DNS
                             addr.sin_addr = dns_addr;
                             break;
+#endif
                         case CTL_ALIAS:
                         default:

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

@@ -152 +152 @@
     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));
@@ -181 +185 @@
     }
 
+#ifndef VBOX_WITH_MULTI_DNS
     pIPAddr = &(FixedInfo->DnsServerList);
     inet_aton(pIPAddr->IpAddress.String, &tmp_addr);
@@ -195 +200 @@
         pIPAddr = pIPAddr ->Next;
     }
+#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));  
+        if (da == NULL) 
+        {
+            LogRel(("can't alloc memory for DNS entry\n"));
+            return -1;
+        }
+        /*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)) {
+            da->de_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS); 
+        }
+        LIST_INSERT_HEAD(&pData->dns_list_head, da, de_list);
+    }
+#endif
     if (FixedInfo)
     {
@@ -370 +395 @@
     m_init(pData);
 
+    inet_aton(pszNetAddr, &special_addr);
+    alias_addr.s_addr = special_addr.s_addr | htonl(CTL_ALIAS);
+
     /* set default addresses */
     inet_aton("127.0.0.1", &loopback_addr);
+#ifndef VBOX_WITH_MULTI_DNS
     inet_aton("127.0.0.1", &dns_addr);
 
     if (get_dns_addr_domain(pData, true, &dns_addr, &pData->pszDomain) < 0)
+#else
+    if (get_dns_addr_domain(pData, true, NULL, &pData->pszDomain) < 0)
+#endif
         fNATfailed = 1;
 
-    inet_aton(pszNetAddr, &special_addr);
-    alias_addr.s_addr = special_addr.s_addr | htonl(CTL_ALIAS);
     getouraddr(pData);
     return fNATfailed ? VINF_NAT_DNS : VINF_SUCCESS;

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

@@ -339 +339 @@
 #endif
 
+#ifndef VBOX_WITH_MULTI_DNS
 #define DO_ALIAS(paddr)                                                     \
 do {                                                                        \
@@ -346 +347 @@
     }                                                                       \
 } while(0)
-#endif
+#else
+#define DO_ALIAS(paddr) do {} while (0)
+#endif
+#endif

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

@@ -52 +52 @@
 };
 
+#ifdef VBOX_WITH_MULTI_DNS
+struct dns_entry
+{
+        struct in_addr de_addr;
+        LIST_ENTRY(dns_entry) de_list; 
+};
+LIST_HEAD(dns_list_head, dns_entry);
+#endif
 
 /** Main state/configuration structure for slirp NAT. */
@@ -92 +100 @@
     struct in_addr alias_addr;
     struct in_addr special_addr;
+#ifndef VBOX_WITH_MULTI_DNS
     struct in_addr dns_addr;
+#else
+    struct dns_list_head dns_list_head;
+#endif
     struct in_addr loopback_addr;
     uint32_t netmask;

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

@@ -573 +573 @@
 #endif
             case CTL_DNS:
+#ifndef VBOX_WITH_MULTI_DNS
                 if (!get_dns_addr(pData, &dns_addr))
                     addr.sin_addr = dns_addr;
@@ -578 +579 @@
                     addr.sin_addr = loopback_addr;
                 break;
+#endif
             case CTL_ALIAS:
             default:

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

@@ -395 +395 @@
             {
                 case CTL_DNS:
+#ifndef VBOX_WITH_MULTI_DNS
                     if (!get_dns_addr(pData, &dns_addr))
                         addr.sin_addr = dns_addr;
@@ -400 +401 @@
                         addr.sin_addr = loopback_addr;
                     break;
+#endif
                 case CTL_ALIAS:
                 default: