Changeset 41812 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 18, 2012 11:42:35 AM (12 years ago)

Author:

vboxsync

Message:

NAT: attempt yo fix #6188, don't miss tcp_drop/close on tcp_input.

File:

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

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

@@ -283 +283 @@
         pSocket->fUnderPolling = 0;
         sofree(pData, pSocket);
-        /* so is PHANTOM, now */
+        /* pSocket is PHANTOM, now */
         return 1;
     }
@@ -1085 +1085 @@
 
 
+/**
+ * This function do Connection or sending tcp sequence to.
+ * @returns if true operation completed
+ * @note: functions call tcp_input that potentially could lead to tcp_drop
+ */
 static bool slirpConnectOrWrite(PNATState pData, struct socket *so, bool fConnectOnly)
 {
@@ -1353 +1358 @@
             )
         {
-            if(!slirpConnectOrWrite(pData, so, false))
+            int fConnectOrWriteSuccess = slirpConnectOrWrite(pData, so, false);
+            /* slirpConnectOrWrite could return true even if tcp_input called tcp_drop,
+             * so we should be ready to such situations.
+             */
+            if (slirpVerifyAndFreeSocket(pData, so))
+                CONTINUE(tcp);
+            else if (!fConnectOrWriteSuccess)
             {
-                if (!slirpVerifyAndFreeSocket(pData, so))
-                    so->fUnderPolling = 0;
+                so->fUnderPolling = 0;
                 CONTINUE(tcp);
             }
+            /* slirpConnectionOrWrite succeeded and socket wasn't dropped */
         }