diff options
| author | Alexander Blair <snipa@jagtech.io> | 2021-01-01 22:42:17 -0800 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2021-01-01 22:42:17 -0800 |
| commit | db686707cb8ec8adcf8d91023da70712782e57c3 (patch) | |
| tree | c8f96908a0fa80f12aa63acacdeb7e89203863c7 | |
| parent | Merge pull request #7235 (diff) | |
| parent | p2p: fix deadlock banning while updating peer lists (diff) | |
| download | monero-db686707cb8ec8adcf8d91023da70712782e57c3.tar.xz | |
Merge pull request #7239
e685f52e2 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 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); }); |