Changeset 38043 in vbox for trunk/src

Timestamp:

Jul 19, 2011 4:36:48 AM (14 years ago)

Author:

vboxsync

Message:

NAT: experiment with FD_CONNECT processing on Windows host (disabled by default).

File:

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

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

@@ -183 +183 @@
 # define closefds_win     FD_CLOSE
 # define closefds_win_bit FD_CLOSE_BIT
+# define connectfds_win     FD_CONNECT
+# define connectfds_win_bit FD_CONNECT_BIT
 
 # define closefds_win FD_CLOSE
@@ -200 +202 @@
 #define TCP_ENGAGE_EVENT2(so, fdset1, fdset2) \
     DO_ENGAGE_EVENT2((so), fdset1, fdset2, tcp)
+
+#ifdef RT_OS_WINDOWS
+# define WIN_TCP_ENGAGE_EVENT2(so, fdset, fdset2) TCP_ENGAGE_EVENT2(so, fdset1, fdset2)
+#else
+# define WIN_TCP_ENGAGE_EVENT2(so, fdset, fdset2) do{}while(0)
+#endif
 
 #define UDP_ENGAGE_EVENT(so, fdset) \
@@ -933 +941 @@
             Log2(("connecting %R[natsock] engaged\n",so));
             STAM_COUNTER_INC(&pData->StatTCPHot);
+#ifndef NAT_CONNECT_EXPERIMENT
             TCP_ENGAGE_EVENT1(so, writefds);
+#else
+# ifdef RT_OS_WINDOWS
+            WIN_TCP_ENGAGE_EVENT2(so, writefds, connectfds);
+# else
+            TCP_ENGAGE_EVENT1(so, writefds);
+# endif
+#endif
         }
 
@@ -1159 +1175 @@
                  || WIN_CHECK_FD_SET(so, NetworkEvents, acceptds))
         {
+#ifdef DEBUG_vvl
+            Assert(((so->so_state & SS_ISFCONNECTING) == 0));
+#endif
             /*
              * Check for incoming connections
@@ -1210 +1229 @@
          * Check sockets for writing
          */
-        if (CHECK_FD_SET(so, NetworkEvents, writefds))
+        if (    CHECK_FD_SET(so, NetworkEvents, writefds)
+#if defined(NAT_CONNECT_EXPERIMENT)
+            ||  WIN_CHECK_FD_SET(so, NetworkEvents, connectfds)
+#endif
+            )
         {
             /*