aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2016-10-24 21:38:20 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-10-25 19:29:23 +0200
commit58d4fa7da30cb57e5fc3dca62f49a64e126c76cd (patch)
tree98fa00a54025cd8a5a7cf4bd07cfbaaa38d8add5
parentcb699885728f69da85ecbc85da21ac0db0223a46 (diff)
[net] Remove assert(nMaxInbound > 0)v0.13.1rc3
nMaxInbound might very well be 0 or -1, if the user prefers to keep a small number of maxconnections. Note: nMaxInbound of -1 means that the user set maxconnections to 8 or less, but we still want to keep an additional slot for the feeler connection. Github-Pull: #9008 Rebased-From: fa1c3c2eb0a1853ed0e0662fc2bdbca51e05ccf5
-rw-r--r--src/net.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/net.cpp b/src/net.cpp
index 06fc3fdb85..faa7b00281 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1021,7 +1021,6 @@ static void AcceptConnection(const ListenSocket& hListenSocket) {
CAddress addr;
int nInbound = 0;
int nMaxInbound = nMaxConnections - (MAX_OUTBOUND_CONNECTIONS + MAX_FEELER_CONNECTIONS);
- assert(nMaxInbound > 0);
if (hSocket != INVALID_SOCKET)
if (!addr.SetSockAddr((const struct sockaddr*)&sockaddr))