Changeset 26817 in vbox for trunk

Timestamp:

Feb 26, 2010 7:20:32 AM (15 years ago)

Author:

vboxsync

Message:

NAT: applied patch from xtracker 4710 (fix graceful connection termination on Windows hosts)

File:

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

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

@@ -1155 +1155 @@
          * in some cases once FD_CLOSE engaged on socket it could be flashed latter (for some reasons)
          */
-        if (    CHECK_FD_SET(so, NetworkEvents, closefds)
-            ||  (so->so_close == 1))
-        {
-            so->so_close = 1; /* mark it */
+        if (   CHECK_FD_SET(so, NetworkEvents, closefds)
+            || (so->so_close == 1))
+        {
             /*
              * drain the socket
@@ -1167 +1166 @@
                 if (ret > 0)
                     TCP_OUTPUT(pData, sototcpcb(so));
-                else
+                else 
                     break;
             }
+            /* mark the socket for termination _after_ it was drained */
+            so->so_close = 1;
             CONTINUE(tcp);
         }