Set TCP_NODELAY on in and outgoing TCP

diff --git a/pdns/lwres.cc b/pdns/lwres.cc
index ba064ec26b2ba9cbc0e7d31d1308568c1ce09674..c8f2ce2c0de7f7a41c6b2edbe85a043c7422f90b 100644 (file)
--- a/pdns/lwres.cc
+++ b/pdns/lwres.cc
@@ -261,6 +261,7 @@ static bool tcpconnect(const struct timeval& now, const ComboAddress& ip, TCPOut
   const struct timeval timeout{ g_networkTimeoutMsec / 1000, static_cast<suseconds_t>(g_networkTimeoutMsec) % 1000 * 1000};
   Socket s(ip.sin4.sin_family, SOCK_STREAM);
   s.setNonBlocking();
+  setTCPNoDelay(s.getHandle());
   ComboAddress localip = pdns::getQueryLocalAddress(ip.sin4.sin_family, 0);
   s.bind(localip);
 

diff --git a/pdns/recursordist/rec-tcp.cc b/pdns/recursordist/rec-tcp.cc
index d15fa64d13ed201ddd90c0ae548b9a3e9457051f..f395239555616c3a514e105b450dfbb838f9197d 100644 (file)
--- a/pdns/recursordist/rec-tcp.cc
+++ b/pdns/recursordist/rec-tcp.cc
@@ -654,6 +654,7 @@ void handleNewTCPQuestion(int fd, FDMultiplexer::funcparam_t&)
     }
 
     setNonBlocking(newsock);
+    setTCPNoDelay(newsock);
     std::shared_ptr<TCPConnection> tc = std::make_shared<TCPConnection>(newsock, addr);
     tc->d_source = addr;
     tc->d_destination.reset();