aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2016-12-01 13:03:56 -0800
committerPieter Wuille <pieter.wuille@gmail.com>2016-12-01 13:07:08 -0800
commitc1a52276848d8caa9a9789dff176408c1aa6b1ed (patch)
tree6ba6a667f3b074158242b114eff1ecef2808dfdf
parentc79e52ad304a02cb66c66cfee49c9b82b458e769 (diff)
parent9e1f46821d5bb69e2cbf25738eefa7c6cb99c838 (diff)
downloadbitcoin-c1a52276848d8caa9a9789dff176408c1aa6b1ed.tar.xz
Merge #9253: Fix calculation of number of bound sockets to use
9e1f468 Fix calculation of number of bound sockets to use (Matt Corallo)
-rw-r--r--src/init.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 63ec744812..377d196f2b 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -859,7 +859,9 @@ bool AppInitParameterInteraction()
}
// Make sure enough file descriptors are available
- int nBind = std::max((int)mapArgs.count("-bind") + (int)mapArgs.count("-whitebind"), 1);
+ int nBind = std::max(
+ (mapMultiArgs.count("-bind") ? mapMultiArgs.at("-bind").size() : 0) +
+ (mapMultiArgs.count("-whitebind") ? mapMultiArgs.at("-whitebind").size() : 0), size_t(1));
nUserMaxConnections = GetArg("-maxconnections", DEFAULT_MAX_PEER_CONNECTIONS);
nMaxConnections = std::max(nUserMaxConnections, 0);