Browse Source

Merge #8189: rename mapAddrCount to mapNetGroupNodes

657fc19 rename mapAddrCount to mapNetGroupNodes (instagibbs)
0.14
Wladimir J. van der Laan 8 years ago
parent
commit
194110fb91
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 10
      src/net.cpp

10
src/net.cpp

@ -982,11 +982,11 @@ static bool AttemptToEvictConnection() {
uint64_t naMostConnections; uint64_t naMostConnections;
unsigned int nMostConnections = 0; unsigned int nMostConnections = 0;
int64_t nMostConnectionsTime = 0; int64_t nMostConnectionsTime = 0;
std::map<uint64_t, std::vector<NodeEvictionCandidate> > mapAddrCounts; std::map<uint64_t, std::vector<NodeEvictionCandidate> > mapNetGroupNodes;
BOOST_FOREACH(const NodeEvictionCandidate &node, vEvictionCandidates) { BOOST_FOREACH(const NodeEvictionCandidate &node, vEvictionCandidates) {
mapAddrCounts[node.nKeyedNetGroup].push_back(node); mapNetGroupNodes[node.nKeyedNetGroup].push_back(node);
int64_t grouptime = mapAddrCounts[node.nKeyedNetGroup][0].nTimeConnected; int64_t grouptime = mapNetGroupNodes[node.nKeyedNetGroup][0].nTimeConnected;
size_t groupsize = mapAddrCounts[node.nKeyedNetGroup].size(); size_t groupsize = mapNetGroupNodes[node.nKeyedNetGroup].size();
if (groupsize > nMostConnections || (groupsize == nMostConnections && grouptime > nMostConnectionsTime)) { if (groupsize > nMostConnections || (groupsize == nMostConnections && grouptime > nMostConnectionsTime)) {
nMostConnections = groupsize; nMostConnections = groupsize;
@ -996,7 +996,7 @@ static bool AttemptToEvictConnection() {
} }
// Reduce to the network group with the most connections // Reduce to the network group with the most connections
vEvictionCandidates = std::move(mapAddrCounts[naMostConnections]); vEvictionCandidates = std::move(mapNetGroupNodes[naMostConnections]);
// Disconnect from the network group with the most connections // Disconnect from the network group with the most connections
NodeId evicted = vEvictionCandidates.front().id; NodeId evicted = vEvictionCandidates.front().id;

Loading…
Cancel
Save