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

Timestamp:

Apr 9, 2012 8:13:57 AM (13 years ago)

Author:

vboxsync

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

77350

Message:

NAT: make sure that socket is still on queue, before doing any further diagnostic and operations.

File:

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

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

@@ -1307 +1307 @@
             || (so->so_close == 1))
         {
+            struct socket *pPrevSo = NULL;
+            /**
+             * we need easy way to detection mechanism if socket has been freed or not
+             * before continuing any further diagnostic.
+             */
+            pPrevSo = so->so_prev;
+            AssertPtr(pPrevSo);
             /*
              * drain the socket
              */
-            for (;;)
+            for (; pPrevSo->so_next == so ;)
             {
                 ret = soread(pData, so);
                 if (ret > 0)
                     TCP_OUTPUT(pData, sototcpcb(so));
-                else
+                else if (pPrevSo->so_next == so)
                 {
                     Log2(("%R[natsock] errno %d (%s)\n", so, errno, strerror(errno)));
@@ -1321 +1328 @@
                 }
             }
-            /* mark the socket for termination _after_ it was drained */
-            so->so_close = 1;
-            /* No idea about Windows but on Posix, POLLHUP means that we can't send more.
-             * Actually in the specific error scenario, POLLERR is set as well. */
+            if (pPrevSo->so_next == so)
+            {
+                /* mark the socket for termination _after_ it was drained */
+                so->so_close = 1;
+                /* No idea about Windows but on Posix, POLLHUP means that we can't send more.
+                 * Actually in the specific error scenario, POLLERR is set as well. */
 #ifndef RT_OS_WINDOWS
-            if (CHECK_FD_SET(so, NetworkEvents, rderr))
-                sofcantsendmore(so);
-#endif
+                if (CHECK_FD_SET(so, NetworkEvents, rderr))
+                    sofcantsendmore(so);
+#endif
+            }
             CONTINUE(tcp);
         }