Browse Source

Prefer to disconnect peers in favor of whitelisted peers

0.13
Patrick Strateman 9 years ago
parent
commit
b105ba398b
  1. 7
      src/net.cpp

7
src/net.cpp

@ -818,7 +818,7 @@ public:
} }
}; };
static bool AttemptToEvictConnection() { static bool AttemptToEvictConnection(bool fPreferNewConnection) {
std::vector<CNode*> vEvictionCandidates; std::vector<CNode*> vEvictionCandidates;
{ {
LOCK(cs_vNodes); LOCK(cs_vNodes);
@ -866,7 +866,10 @@ static bool AttemptToEvictConnection() {
// Reduce to the CNetAddr with the most connections // Reduce to the CNetAddr with the most connections
vEvictionCandidates = mapAddrCounts[naMostConnections]; vEvictionCandidates = mapAddrCounts[naMostConnections];
// Do not disconnect peers who have only 1 evictable connection
if (vEvictionCandidates.size() <= 1) if (vEvictionCandidates.size() <= 1)
// unless we prefer the new connection (for whitelisted peers)
if (!fPreferNewConnection)
return false; return false;
// Disconnect the most recent connection from the CNetAddr with the most connections // Disconnect the most recent connection from the CNetAddr with the most connections
@ -920,7 +923,7 @@ static void AcceptConnection(const ListenSocket& hListenSocket) {
if (nInbound >= nMaxInbound) if (nInbound >= nMaxInbound)
{ {
if (!AttemptToEvictConnection()) { if (!AttemptToEvictConnection(whitelisted)) {
// No connection to evict, disconnect the new connection // No connection to evict, disconnect the new connection
LogPrint("net", "failed to find an eviction candidate - connection dropped (full)\n"); LogPrint("net", "failed to find an eviction candidate - connection dropped (full)\n");
CloseSocket(hSocket); CloseSocket(hSocket);

Loading…
Cancel
Save