From 3c3cb60a904ee7c34ebda1b18fd68c958e2eec53 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sun, 1 Jul 2012 04:13:00 +0200 Subject: [PATCH 1/2] Remove useless high-volume printf (fixes #1544). --- src/net.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/net.cpp b/src/net.cpp index 2a09d20de..9d32d0924 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -938,8 +938,6 @@ void ThreadSocketHandler2(void* parg) pnode->CloseSocketDisconnect(); } } - if (vSend.size() > SendBufferSize()) - printf("socket send buffer full warning (%d bytes)\n", vSend.size()); } } } From 6d6c2afb2b014ecaf43fea2690f6021f78f57488 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sun, 1 Jul 2012 04:17:26 +0200 Subject: [PATCH 2/2] Change default send buffer to 1Mb. --- src/init.cpp | 2 +- src/net.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index b25d52200..5c87af911 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -239,7 +239,7 @@ std::string HelpMessage() " -banscore= " + _("Threshold for disconnecting misbehaving peers (default: 100)") + "\n" + " -bantime= " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n" + " -maxreceivebuffer= " + _("Maximum per-connection receive buffer, *1000 bytes (default: 5000)") + "\n" + - " -maxsendbuffer= " + _("Maximum per-connection send buffer, *1000 bytes (default: 5000)") + "\n" + + " -maxsendbuffer= " + _("Maximum per-connection send buffer, *1000 bytes (default: 1000)") + "\n" + #ifdef USE_UPNP #if USE_UPNP " -upnp " + _("Use UPnP to map the listening port (default: 1 when listening)") + "\n" + diff --git a/src/net.h b/src/net.h index 21ecaef84..f6608bc03 100644 --- a/src/net.h +++ b/src/net.h @@ -27,7 +27,7 @@ extern int nBestHeight; inline unsigned int ReceiveBufferSize() { return 1000*GetArg("-maxreceivebuffer", 5*1000); } -inline unsigned int SendBufferSize() { return 1000*GetArg("-maxsendbuffer", 5*1000); } +inline unsigned int SendBufferSize() { return 1000*GetArg("-maxsendbuffer", 1*1000); } void AddOneShot(std::string strDest); bool RecvLine(SOCKET hSocket, std::string& strLine);