From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 26 Apr 2016 11:40:06 +0000 (+0200)
Subject: hook up nodelay, silence output 'connecting to..' unless --verbose
X-Git-Tag: rec-4.0.0-alpha3~40^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c186303d2a0b1d3f799b6bdcf8cd39b7c2a56a4;p=thirdparty%2Fpdns.git

hook up nodelay, silence output 'connecting to..' unless --verbose
---

diff --git a/pdns/dnsdist-console.cc b/pdns/dnsdist-console.cc
index 22b128b249..8d00418b88 100644
--- a/pdns/dnsdist-console.cc
+++ b/pdns/dnsdist-console.cc
@@ -18,14 +18,15 @@ void feedConfigDelta(const std::string& line)
 
 void doClient(ComboAddress server, const std::string& command)
 {
-  cout<<"Connecting to "<<server.toStringWithPort()<<endl;
+  if(g_verbose)
+    cout<<"Connecting to "<<server.toStringWithPort()<<endl;
   int fd=socket(server.sin4.sin_family, SOCK_STREAM, 0);
   if (fd < 0) {
     cerr<<"Unable to connect to "<<server.toStringWithPort()<<endl;
     return;
   }
   SConnect(fd, server);
-
+  setTCPNoDelay(fd);
   SodiumNonce theirs, ours;
   ours.init();
 
@@ -255,6 +256,7 @@ char** my_completion( const char * text , int start,  int end)
 void controlClientThread(int fd, ComboAddress client)
 try
 {
+  setTCPNoDelay(fd);
   SodiumNonce theirs;
   readn2(fd, (char*)theirs.value, sizeof(theirs.value));
   SodiumNonce ours;