Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[P2P] Do not fully sort all nodes for addr relay #2849

Merged
merged 1 commit into from
May 21, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions src/net_processing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -862,24 +862,32 @@ static void RelayTransaction(const CTransaction& tx, CConnman* connman)
static void RelayAddress(const CAddress& addr, bool fReachable, CConnman* connman)
{
if (!fReachable && !addr.IsRelayable()) return;
int nRelayNodes = fReachable ? 2 : 1; // limited relaying of addresses outside our network(s)
unsigned int nRelayNodes = fReachable ? 2 : 1; // limited relaying of addresses outside our network(s)

// Relay to a limited number of other nodes
// Use deterministic randomness to send to the same nodes for 24 hours
// at a time so the addrKnowns of the chosen nodes prevent repeats
uint64_t hashAddr = addr.GetHash();
std::multimap<uint64_t, CNode*> mapMix;
const CSipHasher hasher = connman->GetDeterministicRandomizer(RANDOMIZER_ID_ADDRESS_RELAY).Write(hashAddr << 32).Write((GetTime() + hashAddr) / (24*60*60));
FastRandomContext insecure_rand;

auto sortfunc = [&mapMix, &hasher](CNode* pnode) {
std::array<std::pair<uint64_t, CNode*>,2> best{{{0, nullptr}, {0, nullptr}}};

auto sortfunc = [&best, &hasher, nRelayNodes](CNode* pnode) {
uint64_t hashKey = CSipHasher(hasher).Write(pnode->GetId()).Finalize();
mapMix.emplace(hashKey, pnode);
for (unsigned int i = 0; i < nRelayNodes; i++) {
if (hashKey > best[i].first) {
std::copy(best.begin() + i, best.begin() + nRelayNodes - 1, best.begin() + i + 1);
best[i] = std::make_pair(hashKey, pnode);
break;
}
}
};

auto pushfunc = [&addr, &mapMix, &nRelayNodes] {
FastRandomContext insecure_rand;
for (auto mi = mapMix.begin(); mi != mapMix.end() && nRelayNodes-- > 0; ++mi)
mi->second->PushAddress(addr, insecure_rand);
auto pushfunc = [&addr, &best, nRelayNodes, &insecure_rand] {
for (unsigned int i = 0; i < nRelayNodes && best[i].first != 0; i++) {
best[i].second->PushAddress(addr, insecure_rand);
}
};

connman->ForEachNodeThen(std::move(sortfunc), std::move(pushfunc));
Expand Down