Fix calculation of number of bound sockets to use

TheBlueMatt · luke-jr · commit 28d0f224fda3 · 2016-12-02T07:53:40.000Z
Github-Pull: #9253 Rebased-From: 9e1f468
diff --git a/src/init.cpp b/src/init.cpp
@@ -854,7 +854,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     }
 
     // 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));
     int nUserMaxConnections = GetArg("-maxconnections", DEFAULT_MAX_PEER_CONNECTIONS);
     nMaxConnections = std::max(nUserMaxConnections, 0);
 

Original file line number	Diff line number	Diff line change
`@@ -854,7 +854,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)`
`854`	`854`	`}`
`855`	`855`
`856`	`856`	`// Make sure enough file descriptors are available`
`857`		`- int nBind = std::max((int)mapArgs.count("-bind") + (int)mapArgs.count("-whitebind"), 1);`
	`857`	`+ int nBind = std::max(`
	`858`	`+ (mapMultiArgs.count("-bind") ? mapMultiArgs.at("-bind").size() : 0) +`
	`859`	`+ (mapMultiArgs.count("-whitebind") ? mapMultiArgs.at("-whitebind").size() : 0), size_t(1));`
`858`	`860`	`int nUserMaxConnections = GetArg("-maxconnections", DEFAULT_MAX_PEER_CONNECTIONS);`
`859`	`861`	`nMaxConnections = std::max(nUserMaxConnections, 0);`
`860`	`862`