Changeset 56176 in vbox

Timestamp:

Jun 1, 2015 9:29:58 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

100709

Message:

NAT: Don't forcibly reset/drop all connections when link goes down.
Link flap we do to prod DHCP must not be fatal for established
connections if connectivity hasn't really changed.

File:

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

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

@@ -489 +489 @@
 void slirp_link_down(PNATState pData)
 {
-    struct socket *so;
     struct port_forward_rule *rule;
 
@@ -496 +495 @@
 
     slirpReleaseDnsSettings(pData);
+
+    /*
+     *  Clear the active state of port-forwarding rules to force
+     *  re-setup on restoration of communications.
+     */
+    LIST_FOREACH(rule, &pData->port_forward_rule_head, list)
+    {
+        rule->activated = 0;
+    }
+    pData->cRedirectionsActive = 0;
+
+    link_up = 0;
+}
+
+/**
+ * Terminates the slirp component.
+ */
+void slirp_term(PNATState pData)
+{
+    struct socket *so;
+
+    if (pData == NULL)
+        return;
+
+    icmp_finit(pData);
 
     while ((so = tcb.so_next) != &tcb)
@@ -510 +534 @@
     while ((so = udb.so_next) != &udb)
         udp_detach(pData, so);
-
-    /*
-     *  Clear the active state of port-forwarding rules to force
-     *  re-setup on restoration of communications.
-     */
-    LIST_FOREACH(rule, &pData->port_forward_rule_head, list)
-    {
-        rule->activated = 0;
-    }
-    pData->cRedirectionsActive = 0;
-
-    link_up = 0;
-}
-
-/**
- * Terminates the slirp component.
- */
-void slirp_term(PNATState pData)
-{
-    if (pData == NULL)
-        return;
-    icmp_finit(pData);
 
     slirp_link_down(pData);