diff options
author | Jeff Garzik <jgarzik@exmulti.com> | 2012-07-01 18:17:34 -0700 |
---|---|---|
committer | Jeff Garzik <jgarzik@exmulti.com> | 2012-07-01 18:17:34 -0700 |
commit | da1103f4f8288cffc9ea475254fdeb258f04de77 (patch) | |
tree | 89c78b943d7464d1781ceaa55e07f21370471a4b | |
parent | 18e8e43715b0704b0e94d60f51bce28d6510ed0d (diff) | |
parent | 6d6c2afb2b014ecaf43fea2690f6021f78f57488 (diff) | |
download | bitcoin-da1103f4f8288cffc9ea475254fdeb258f04de77.tar.xz |
Merge pull request #1545 from TheBlueMatt/diffsendbuffer
Minor send buffer changes
-rw-r--r-- | src/init.cpp | 2 | ||||
-rw-r--r-- | src/net.cpp | 2 | ||||
-rw-r--r-- | src/net.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/init.cpp b/src/init.cpp index b25d52200f..5c87af9112 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -239,7 +239,7 @@ std::string HelpMessage() " -banscore=<n> " + _("Threshold for disconnecting misbehaving peers (default: 100)") + "\n" + " -bantime=<n> " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n" + " -maxreceivebuffer=<n> " + _("Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)") + "\n" + - " -maxsendbuffer=<n> " + _("Maximum per-connection send buffer, <n>*1000 bytes (default: 5000)") + "\n" + + " -maxsendbuffer=<n> " + _("Maximum per-connection send buffer, <n>*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.cpp b/src/net.cpp index 2a09d20dea..9d32d0924a 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()); } } } @@ -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); |