diff options
| author | Alexander Blair <snipa@jagtech.io> | 2021-01-01 22:32:34 -0800 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2021-01-01 22:32:34 -0800 |
| commit | 2d60232355774113166956bb34819606eb977907 (patch) | |
| tree | 13d50160125e679798d8f7d3fae426412ed59e6d | |
| parent | Merge pull request #7234 (diff) | |
| parent | p2p: fix deadlock banning while updating peer lists (diff) | |
| download | monero-2d60232355774113166956bb34819606eb977907.tar.xz | |
Merge pull request #7237
656b2f7ce p2p: fix deadlock banning while updating peer lists (moneromooo)
| -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 bf053f0f2..487e89923 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -2149,6 +2149,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); }); |