From a569483c19ea7f4716fb8a7a9c7df2f674fabc2f Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Sun, 13 Dec 2020 23:12:19 +0000 Subject: [PATCH] p2p: ignore incoming peer list entries when we have them blocked --- src/p2p/net_node.inl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 65db2615c..128d17155 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -2093,7 +2093,9 @@ 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_)); - 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); }); + 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); + }); } //----------------------------------------------------------------------------------- template