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

Timestamp:

May 16, 2012 6:22:42 PM (13 years ago)

Author:

vboxsync

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

78016

Message:

NAT: attempt to fix #6188. libaslias marks sockets for deletion, but don't delete.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• libalias/alias_db.c (modified) (3 diffs)
• slirp.c (modified) (3 diffs)

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

@@ -1018 +1018 @@
         struct libalias *la = lnk->la;
         la->sockCount--;
+        lnk->pSo->fShouldBeRemoved = 1;
         lnk->pSo = NULL;
     }
@@ -1061 +1062 @@
         close(lnk->sockfd);
     }
-# else
+# else /* VBOX */
     if (lnk->pSo)
     {
@@ -1071 +1072 @@
          * narrow-minded and just do sofree here
          */
+#if 0
         sofree(la->pData, lnk->pSo);
-        lnk->pSo = NULL;
+#else
+        slirpDeleteLinkSocket(lnk);
+#endif
     }
 # endif

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

@@ -1252 +1252 @@
         Assert((!so->so_cloneOf));
 #endif
+        Assert(!so->fUnderPolling);
+        so->fUnderPolling = 1;
+        if (slirpVerifyAndFreeSocket(pData, so))
+            CONTINUE(tcp);
         /*
          * FD_ISSET is meaningless on these sockets
@@ -1257 +1261 @@
          */
         if (so->so_state & SS_NOFDREF || so->s == -1)
+        {
+            so->fUnderPolling = 0;
             CONTINUE(tcp);
-
-        Assert(!so->fUnderPolling);
-        so->fUnderPolling = 1;
+        }
+
         POLL_TCP_EVENTS(rc, error, so, &NetworkEvents);
 
@@ -1491 +1496 @@
             CONTINUE_NO_UNLOCK(udp);
 #endif
+#if 0
+        so->fUnderPolling = 1;
+        if(slirpVerifyAndFreeSocket(pData, so));
+            CONTINUE(udp);
+        so->fUnderPolling = 0;
+#endif
+
         POLL_UDP_EVENTS(rc, error, so, &NetworkEvents);