Changeset 16815 in vbox for trunk/src

Timestamp:

Feb 17, 2009 7:26:09 AM (16 years ago)

Author:

vboxsync

Message:

NAT: Another yet Graceful connection termination case in MS networking

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• slirp.c (modified) (2 diffs)
• socket.h (modified) (1 diff)

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

@@ -988 +988 @@
             /*
              * Check for FD_CLOSE events.
+             * in some cases once FD_CLOSE engaged on socket it could be flashed latter (for some reasons)
              */
-            if (NetworkEvents.lNetworkEvents & FD_CLOSE)
-            {
+            if (    (NetworkEvents.lNetworkEvents & FD_CLOSE)
+                ||  (so->so_close == 1))
+            {
+                so->so_close = 1; /* mark it */
                 /*
                  * drain the socket
@@ -1002 +1005 @@
                         break;
                 }
+                CONTINUE(tcp);
             }
 #endif

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

@@ -73 +73 @@
 #if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && !defined(RT_OS_WINDOWS)
     int so_poll_index;
+#endif
+#if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
+    /*
+     * FD_CLOSE event has been occured on socket 
+     */
+    int so_close; 
 #endif
 };