Changeset 73746 in vbox for trunk

Timestamp:

Aug 17, 2018 6:17:59 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

124427

Message:

NAT/NATNet: Disable Nagle algorighm on the host using TCP_NODELAY (bugref:9226).

Location:

trunk/src/VBox

Files:

• Devices/Network/slirp/tcp_subr.c (modified) (2 diffs)
• NetworkServices/NAT/proxy.c (modified) (1 diff)

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

@@ -416 +416 @@
         opt = 1;
         setsockopt(s, SOL_SOCKET, SO_OOBINLINE, (char *)&opt, sizeof(opt));
+        opt = 1;
+        setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *)&opt, sizeof(opt));
 
         ret = sobind(pData, so);
@@ -551 +553 @@
     opt = 1;
     setsockopt(s, SOL_SOCKET, SO_OOBINLINE,(char *)&opt, sizeof(int));
-#if 0
     opt = 1;
     setsockopt(s, IPPROTO_TCP, TCP_NODELAY,(char *)&opt, sizeof(int));
-#endif
 
     optlen = sizeof(int);

trunk/src/VBox/NetworkServices/NAT/proxy.c

@@ -359 +359 @@
     }
 #endif
+
+    /*
+     * Disable the Nagle algorithm. Otherwise the host may hold back
+     * packets that the guest wants to go out, causing potentially
+     * horrible performance. The guest is already applying the Nagle
+     * algorithm (or not) the way it wants.
+     */
+    if (stype == SOCK_STREAM) {
+        int on = 1;
+        const socklen_t onlen = sizeof(on);
+
+        status = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *)&on, onlen);
+        if (status < 0) {
+            DPRINTF(("TCP_NODELAY: %R[sockerr]\n", SOCKERRNO()));
+            closesocket(s);
+            return INVALID_SOCKET;
+        }
+    }
 
 #if defined(RT_OS_WINDOWS)