diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-19 16:46:18 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-19 16:46:50 +0200 |
commit | f07424a6716c1fc37dc7a4d66d8efcdbba975852 (patch) | |
tree | 77b48bb374ca44b1a45b1480f3aea057fe41b441 /src/net.cpp | |
parent | 9ac01301f5c45698a5db356da9e8dbc1500f7c31 (diff) | |
parent | f3552da81393a8e78ce3e2afed0b9c9d1ff5cee0 (diff) |
Merge #8707: net: fix maxuploadtarget setting
f3552da net: fix maxuploadtarget setting (Cory Fields)
Diffstat (limited to 'src/net.cpp')
-rw-r--r-- | src/net.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/net.cpp b/src/net.cpp index 38b1e7926a..c32f81d8dc 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -2046,9 +2046,7 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st { nTotalBytesRecv = 0; nTotalBytesSent = 0; - nMaxOutboundLimit = 0; nMaxOutboundTotalBytesSentInCycle = 0; - nMaxOutboundTimeframe = 60*60*24; //1 day nMaxOutboundCycleStartTime = 0; nRelevantServices = connOptions.nRelevantServices; @@ -2060,6 +2058,9 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st nSendBufferMaxSize = connOptions.nSendBufferMaxSize; nReceiveFloodSize = connOptions.nSendBufferMaxSize; + nMaxOutboundLimit = connOptions.nMaxOutboundLimit; + nMaxOutboundTimeframe = connOptions.nMaxOutboundTimeframe; + SetBestHeight(connOptions.nBestHeight); clientInterface = connOptions.uiInterface; |