Changeset 38068 in vbox for trunk/src/VBox

Timestamp:

Jul 19, 2011 12:35:11 PM (13 years ago)

Author:

vboxsync

Message:

NAT: experiment with NAT connection (2), attempt to fix xTracker/5742.

File:

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

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

@@ -967 +967 @@
          */
         /* @todo: vvl - check which predicat here will be more useful here in rerm of new sbufs. */
-        if (CONN_CANFRCV(so) && (SBUF_LEN(&so->so_snd) < (SBUF_SIZE(&so->so_snd)/2)))
+        if (   CONN_CANFRCV(so)
+            && (SBUF_LEN(&so->so_snd) < (SBUF_SIZE(&so->so_snd)/2))
+#ifdef NAT_CONNECT_EXPERIMENT
+            && !(so->so_state & SS_ISFCONNECTING)
+#endif
+        )
         {
             STAM_COUNTER_INC(&pData->StatTCPHot);
@@ -1167 +1172 @@
 # ifdef RT_OS_WINDOWS
             /**
-             * In some cases FD_CONNECT comes with FD_OOB, that confuse tcp processing.
+             * In some cases FD_CLOSE comes with FD_OOB, that confuse tcp processing.
              */
-            && !WIN_CHECK_FD_SET(so, NetworkEvents, connectfds)
+            && !WIN_CHECK_FD_SET(so, NetworkEvents, closefds)
 # endif
 #endif
@@ -1183 +1188 @@
                  || WIN_CHECK_FD_SET(so, NetworkEvents, acceptds))
         {
+
 #ifdef DEBUG_vvl
             Assert(((so->so_state & SS_ISFCONNECTING) == 0));
+#endif
+#ifdef NAT_CONNECT_EXPERIMENT
+            if (WIN_CHECK_FD_SET(so, NetworkEvents, connectfds))
+            {
+                TCP_ENGAGE_EVENT2(so, readfds, acceptds);
+                goto dont_read_now;
+            }
 #endif
             /*
@@ -1200 +1213 @@
             if (RT_LIKELY(ret > 0))
                 TCP_OUTPUT(pData, sototcpcb(so));
+#ifdef NAT_CONNECT_EXPERIMENT
+dont_read_now:;
+#endif
         }
 
@@ -1592 +1608 @@
     size_t mlen = 0;
     STAM_PROFILE_START(&pData->StatIF_encap, a);
+    LogFlowFunc(("ENTER: pData:%p, eth_proto:%RX16, m:%p, flags:%d\n",
+                pData, eth_proto, m, flags));
 
     M_ASSERTPKTHDR(m);
@@ -1632 +1650 @@
     mbuf = mtod(m, uint8_t *);
     eh->h_proto = RT_H2N_U16(eth_proto);
+    LogFunc(("eh(dst:%RTmac, src:%RTmac)\n", eh->h_dest, eh->h_source));
     if (flags & ETH_ENCAP_URG)
         slirp_urg_output(pData->pvUser, m, mbuf, mlen);
@@ -1638 +1657 @@
 done:
     STAM_PROFILE_STOP(&pData->StatIF_encap, a);
+    LogFlowFuncLeave();
 }