Changeset 52283 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Aug 5, 2014 3:34:32 PM (10 years ago)

Author:

vboxsync

Message:

NAT: Do pay attention to POLLERR and WSANETWORKEVENTS::iErrorCode and
abort TCP connections on socket errors. That makes RST propagated to
the guest properly (tickets 10525, 11696).

File:

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

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

@@ -967 +967 @@
         LOG_NAT_SOCK(so, TCP, &NetworkEvents, readfds, writefds, xfds);
 
+        /*
+         * It's hard to hide error condition check behind existing
+         * macros without uglifying them further, so open-code it here
+         * instead.
+         */
+        {
+            int pollerr = 0;
+#if defined(RT_OS_WINDOWS)
+            {
+                int bit;
+                for (bit = 0; bit <= FD_CLOSE_BIT; ++bit)
+                {
+                    if (   NetworkEvents.lNetworkEvents & (1 << bit)
+                        && NetworkEvents.iErrorCode[bit] != 0)
+                    {
+                        pollerr = NetworkEvents.iErrorCode[bit];
+                        break;
+                    }
+                }
+            }
+#else
+            if (CHECK_FD_SET(so, NetworkEvents, rderr))
+            {
+                socklen_t optlen = (socklen_t)sizeof(int);
+                ret = getsockopt(so->s, SOL_SOCKET, SO_ERROR, &pollerr, &optlen);
+                if (ret < 0)
+                    pollerr = ENETDOWN;
+            }
+#endif
+            if (pollerr)
+            {
+                if (so->so_state & SS_ISFCONNECTING)
+                {
+                    /* "continue" tcp_input() to reject connection from guest */
+                    so->so_state = SS_NOFDREF;
+                    TCP_INPUT(pData, NULL, 0, so);
+                }
+                else
+                {
+                    tcp_drop(pData, sototcpcb(so), pollerr);
+                }
+                ret = slirpVerifyAndFreeSocket(pData, so);
+                Assert(ret == 1); /* freed */
+                CONTINUE(tcp);
+            }
+        }
 
         /*
@@ -1070 +1116 @@
                 /* 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 (so_next->so_prev == so)