Changeset 64679 in vbox

Timestamp:

Nov 15, 2016 11:51:15 PM (8 years ago)

Author:

vboxsync

Message:

NAT: slirp_select_poll - don't stop after draining half-closed socket,
we still need to check it for POLLOUT.

This whole block could use some refactoring to clarify repeated
conditions and spooky action at a distance, but this fix is intended
to have minimal diff.

File:

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

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

@@ -1128 +1128 @@
 
             /* if socket freed ''so'' is PHANTOM and next socket isn't points on it */
-            if (so_next->so_prev == so)
+            if (so_next->so_prev != so)
+            {
+                CONTINUE(tcp);
+            }
+            else
             {
                 /* mark the socket for termination _after_ it was drained */
@@ -1139 +1143 @@
 #endif
             }
-            if (so_next->so_prev == so)
-                so->fUnderPolling = 0;
-            CONTINUE(tcp);
         }