Changeset 29506 in vbox

Timestamp:

May 17, 2010 7:14:47 AM (15 years ago)

Author:

vboxsync

Message:

NAT: backed r61642, pospone till 3.2.2.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

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

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

@@ -636 +636 @@
     struct in_addr req_ip;
     int fDhcpDiscover = 0;
-    uint8_t *parameter_list = NULL;
     struct mbuf *m = NULL;
 
@@ -652 +651 @@
     if (p == NULL)
         return;
-    /*
-     * We're going update dns list at least once per DHCP transaction (!not on every operation
-     * within transaction), assuming that transaction can't be longer than 1 min.
-     */
-    if (   !pData->fUseHostResolver
-           && (   pData->dnsLastUpdate == 0 
-               || curtime - pData->dnsLastUpdate > 60 * 1000)) /* one minute*/
-    {
-        uint8_t i = 2; /* i = 0 - tag, i == 1 - length */
-        parameter_list = dhcp_find_option(&bp->bp_vend[0], RFC2132_PARAM_LIST);
-        for (;parameter_list && i < parameter_list[1]; ++i)
-        {
-            if (parameter_list[i] == RFC1533_DNS)
-            {
-                slirp_release_dns_list(pData);
-                slirp_init_dns_list(pData);
-                pData->dnsLastUpdate = curtime;
-                break;
-            }
-        }
-    }
 
 #ifndef VBOX_WITH_SLIRP_BSD_MBUF

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

@@ -532 +532 @@
 #endif /* !RT_OS_WINDOWS */
 
-int slirp_init_dns_list(PNATState pData)
+static int slirp_init_dns_list(PNATState pData)
 {
     TAILQ_INIT(&pData->pDnsList);
@@ -539 +539 @@
 }
 
-void slirp_release_dns_list(PNATState pData)
+static void slirp_release_dns_list(PNATState pData)
 {
     struct dns_entry *pDns = NULL;

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

@@ -341 +341 @@
 void slirp_arp_cache_add(PNATState pData, uint32_t ip, const uint8_t *ether);
 int slirp_arp_cache_update_or_add(PNATState pData, uint32_t dst, const uint8_t *mac);
-int slirp_init_dns_list(PNATState pData);
-void slirp_release_dns_list(PNATState pData);
 #define MIN_MRU 128
 #define MAX_MRU 16384

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

@@ -175 +175 @@
     struct in_addr tftp_server;
     struct in_addr loopback_addr;
-    uint32_t dnsLastUpdate;
     uint32_t netmask;
 #ifndef VBOX_WITH_NAT_SERVICE