zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Chris Moore 2011-01-23 00:08:09 -08:00
parent c90ea2bd6d
commit 4698dd9a02
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net.cpp
View File

@ -688,12 +688,25 @@ void ThreadSocketHandler2(void* parg)
socklen_t len = sizeof(sockaddr); socklen_t len = sizeof(sockaddr);
SOCKET hSocket = accept(hListenSocket, (struct sockaddr*)&sockaddr, &len); SOCKET hSocket = accept(hListenSocket, (struct sockaddr*)&sockaddr, &len);
CAddress addr(sockaddr); 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 (hSocket == INVALID_SOCKET)
{ {
if (WSAGetLastError() != WSAEWOULDBLOCK) if (WSAGetLastError() != WSAEWOULDBLOCK)
printf("socket error accept failed: %d\n", WSAGetLastError()); 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); closesocket(hSocket);
} }