Merge #9253: Fix calculation of number of bound sockets to use

9e1f468 Fix calculation of number of bound sockets to use (Matt Corallo)
This commit is contained in:
Pieter Wuille 2016-12-01 13:03:56 -08:00
commit c1a5227684
No known key found for this signature in database
GPG key ID: DBA1A67379A1A931

View file

@ -859,7 +859,9 @@ bool AppInitParameterInteraction()
} }
// Make sure enough file descriptors are available // 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); nUserMaxConnections = GetArg("-maxconnections", DEFAULT_MAX_PEER_CONNECTIONS);
nMaxConnections = std::max(nUserMaxConnections, 0); nMaxConnections = std::max(nUserMaxConnections, 0);