Changeset 41227 in vbox for trunk/src

Timestamp:

May 10, 2012 6:10:17 AM (13 years ago)

Author:

vboxsync

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

77873

Message:

NAT: don't touch anything, except fShouldBeRemoved, when sofree called with fUnderPolling.

File:

• trunk/src/VBox/Devices/Network/slirp/socket.c (modified) (1 diff)

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

@@ -183 +183 @@
 sofree(PNATState pData, struct socket *so)
 {
+    LogFlowFunc(("ENTER:%R[natsock]\n", so));
+    /*
+     * We should not remove socket when polling routine do the polling
+     * instead we mark it for deletion.
+     */
+    if (so->fUnderPolling)
+    {
+        so->fShouldBeRemoved = 1;
+        LogFlowFunc(("LEAVE:%R[natsock] postponed deletion\n", so));
+        return;
+    }
     if (so == tcp_last_so)
         tcp_last_so = &tcb;
     else if (so == udp_last_so)
         udp_last_so = &udb;
+
+#ifndef VBOX_WITH_SLIRP_MT
+
     /* libalias notification */
     if (so->so_pvLnk)
         slirpDeleteLinkSocket(so->so_pvLnk);
-
     /* check if mbuf haven't been already freed  */
     if (so->so_m != NULL)
+    {
         m_freem(pData, so->so_m);
-#ifndef VBOX_WITH_SLIRP_MT
-    /*
-     * We should not remove socket when polling routine do the polling
-     * instead we mark it for deletion.
-     */
-    if (!so->fUnderPolling)
-    {
-        if (so->so_next && so->so_prev)
-        {
-            remque(pData, so);  /* crashes if so is not in a queue */
-            NSOCK_DEC();
-        }
-
-        RTMemFree(so);
-    }
-    else
-        so->fShouldBeRemoved = 1;
+        so->so_m = NULL;
+    }
+
+    if (so->so_next && so->so_prev)
+    {
+        remque(pData, so);  /* crashes if so is not in a queue */
+        NSOCK_DEC();
+    }
+
+    RTMemFree(so);
 #else
     so->so_deleted = 1;
 #endif
+    LogFlowFuncLeave();
 }