mirror of
https://github.com/monero-project/monero.git
synced 2024-12-13 11:56:31 +02:00
Merge pull request #7237
656b2f7ce
p2p: fix deadlock banning while updating peer lists (moneromooo)
This commit is contained in:
commit
2d60232355
@ -2149,6 +2149,7 @@ namespace nodetool
|
|||||||
|
|
||||||
LOG_DEBUG_CC(context, "REMOTE PEERLIST: remote peerlist size=" << peerlist_.size());
|
LOG_DEBUG_CC(context, "REMOTE PEERLIST: remote peerlist size=" << peerlist_.size());
|
||||||
LOG_TRACE_CC(context, "REMOTE PEERLIST: " << ENDL << print_peerlist_to_string(peerlist_));
|
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 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);
|
return !is_addr_recently_failed(pe.adr) && is_remote_host_allowed(pe.adr);
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user