Merge pull request #7239

e685f52e2 p2p: fix deadlock banning while updating peer lists (moneromooo)
remotes/1691602464505633909/tmp_refs/heads/wonerujo-v0.10.1
Alexander Blair 3 years ago
commit db686707cb
No known key found for this signature in database
GPG Key ID: C64552D877C32479

@ -2155,6 +2155,7 @@ namespace nodetool
LOG_DEBUG_CC(context, "REMOTE PEERLIST: remote peerlist size=" << peerlist_.size());
LOG_TRACE_CC(context, "REMOTE PEERLIST: " << ENDL << print_peerlist_to_string(peerlist_));
CRITICAL_REGION_LOCAL(m_blocked_hosts_lock);
return m_network_zones.at(context.m_remote_address.get_zone()).m_peerlist.merge_peerlist(peerlist_, [this](const peerlist_entry &pe) {
return !is_addr_recently_failed(pe.adr) && is_remote_host_allowed(pe.adr);
});

Loading…
Cancel
Save