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

Timestamp:

Mar 4, 2014 12:51:03 AM (11 years ago)

Author:

vboxsync

Message:

NAT: slirp.c: do DNS init/release in link up/down instead of slirp_init/slirp_term.

File:

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

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

@@ -359 +359 @@
     inet_aton("127.0.0.1", &loopback_addr);
 
-    if (!fUseHostResolver)
-    {
-        rc = slirpInitializeDnsSettings(pData);
-        AssertRCReturn(rc, VINF_NAT_DNS);
-    }
-
     rc = slirpTftpInit(pData);
     AssertRCReturn(rc, VINF_NAT_DNS);
@@ -452 +446 @@
 {
     struct arp_cache_entry *ac;
+    
+    if (link_up == 1)
+        return;
+
     link_up = 1;
+
+    if (!pData->fUseHostResolverPermanent)
+        slirpInitializeDnsSettings(pData);
 
     if (LIST_EMPTY(&pData->arp_cache))
@@ -471 +472 @@
     struct port_forward_rule *rule;
 
+    if (link_up == 0)
+        return;
+
+    slirpReleaseDnsSettings(pData);
+    
     while ((so = tcb.so_next) != &tcb)
     {
@@ -508 +514 @@
 
     slirp_link_down(pData);
-    slirpReleaseDnsSettings(pData);
     ftp_alias_unload(pData);
     nbt_alias_unload(pData);