Changeset 38170 in vbox for trunk/src

Timestamp:

Jul 26, 2011 4:50:31 AM (13 years ago)

Author:

vboxsync

Message:

NAT: processing FD_CONNECT on Windows hosts.

File:

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

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

@@ -945 +945 @@
             Log2(("connecting %R[natsock] engaged\n",so));
             STAM_COUNTER_INC(&pData->StatTCPHot);
-#ifndef NAT_CONNECT_EXPERIMENT
+#ifdef RT_OS_WINDOWS
+            WIN_TCP_ENGAGE_EVENT2(so, writefds, connectfds);
+#else
             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
         }
@@ -973 +969 @@
         if (   CONN_CANFRCV(so)
             && (SBUF_LEN(&so->so_snd) < (SBUF_SIZE(&so->so_snd)/2))
-#ifdef NAT_CONNECT_EXPERIMENT
+#ifdef RT_OS_WINDOWS
             && !(so->so_state & SS_ISFCONNECTING)
 #endif
@@ -1230 +1226 @@
             &&  !CHECK_FD_SET(so, NetworkEvents, closefds)
 #endif
-#ifdef NAT_CONNECT_EXPERIMENT
-# ifdef RT_OS_WINDOWS
+#ifdef RT_OS_WINDOWS
             /**
              * In some cases FD_CLOSE comes with FD_OOB, that confuse tcp processing.
              */
             && !WIN_CHECK_FD_SET(so, NetworkEvents, closefds)
-# endif
 #endif
         )
@@ -1250 +1244 @@
         {
 
-#ifdef DEBUG_vvl
-            Assert(((so->so_state & SS_ISFCONNECTING) == 0));
-#endif
-#ifdef NAT_CONNECT_EXPERIMENT
+#ifdef RT_OS_WINDOWS
             if (WIN_CHECK_FD_SET(so, NetworkEvents, connectfds))
             {
@@ -1314 +1305 @@
          */
         if (    CHECK_FD_SET(so, NetworkEvents, writefds)
-#if defined(NAT_CONNECT_EXPERIMENT)
+#ifdef RT_OS_WINDOWS
             ||  WIN_CHECK_FD_SET(so, NetworkEvents, connectfds)
 #endif