Fix -maxconnections. It used to account for the 8 outbound connections twice when calculating the number of slots left for incoming connections.
This commit is contained in:
parent
c90ea2bd6d
commit
4698dd9a02
15
net.cpp
15
net.cpp
@ -688,12 +688,25 @@ void ThreadSocketHandler2(void* parg)
|
||||
socklen_t len = sizeof(sockaddr);
|
||||
SOCKET hSocket = accept(hListenSocket, (struct sockaddr*)&sockaddr, &len);
|
||||
CAddress addr(sockaddr);
|
||||
bool fLimitConnections = false;
|
||||
int nInbound = 0;
|
||||
|
||||
if (mapArgs.count("-maxconnections"))
|
||||
fLimitConnections = true;
|
||||
|
||||
if (fLimitConnections)
|
||||
{
|
||||
CRITICAL_BLOCK(cs_vNodes)
|
||||
foreach(CNode* pnode, vNodes)
|
||||
if (pnode->fInbound)
|
||||
nInbound++;
|
||||
}
|
||||
if (hSocket == INVALID_SOCKET)
|
||||
{
|
||||
if (WSAGetLastError() != WSAEWOULDBLOCK)
|
||||
printf("socket error accept failed: %d\n", WSAGetLastError());
|
||||
}
|
||||
else if (mapArgs.count("-maxconnections") && (int)vNodes.size() >= atoi(mapArgs["-maxconnections"]) - MAX_OUTBOUND_CONNECTIONS)
|
||||
else if (fLimitConnections && nInbound >= atoi(mapArgs["-maxconnections"]) - MAX_OUTBOUND_CONNECTIONS)
|
||||
{
|
||||
closesocket(hSocket);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user