diff options
| author | moneromooo <moneromoo@nowhere.nowhere.nowhere> | 2020-12-31 02:05:39 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2020-12-31 03:15:11 +0000 |
| commit | e685f52e258e084fc8f2bfe890680addb15ddacc (patch) | |
| tree | e1f7c1e920f63e6acf039241e9d22d74d74de6cd /src | |
| parent | Merge pull request #7222 (diff) | |
| download | monero-e685f52e258e084fc8f2bfe890680addb15ddacc.tar.xz | |
p2p: fix deadlock banning while updating peer lists
Diffstat (limited to 'src')
| -rw-r--r-- | src/p2p/net_node.inl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index b8b937de4..2387e3bff 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -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); }); |