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

Timestamp:

Jul 11, 2012 7:19:03 AM (12 years ago)

Author:

vboxsync

Message:

NAT: TCB releasing on slirp_link_down. (no more assertions on shutdown, not tested)

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• slirp.c (modified) (1 diff)
• tcp_subr.c (modified) (1 diff)

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

@@ -462 +462 @@
     while ((so = tcb.so_next) != &tcb)
     {
-        if (so->so_state & SS_NOFDREF || so->s == -1)
-            sofree(pData, so);
+        /* Don't miss TCB releasing */
+        if (   !sototcpcb(so)
+            && (   so->so_state & SS_NOFDREF
+                || so->s == -1))
+             sofree(pData, so);
         else
-            tcp_drop(pData, sototcpcb(so), 0);
+            tcp_close(pData, sototcpcb(so));
     }
 

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

@@ -299 +299 @@
     if (so == tcp_last_so)
         tcp_last_so = &tcb;
-    closesocket(so->s);
+    if (so->s != -1)
+        closesocket(so->s);
     /* Avoid double free if the socket is listening and therefore doesn't have
      * any sbufs reserved. */