diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2020-12-13 23:12:19 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2020-12-13 23:14:22 +0000 |
| commit | a569483c19ea7f4716fb8a7a9c7df2f674fabc2f (patch) | |
| tree | b4493699f54bdd9422ba86c0513ba04550f193cd | |
| parent | Merge pull request #7131 (diff) | |
| download | monero-a569483c19ea7f4716fb8a7a9c7df2f674fabc2f.tar.xz | |
p2p: ignore incoming peer list entries when we have them blocked
| -rw-r--r-- | src/p2p/net_node.inl | 4 |
1 files changed, 3 insertions, 1 deletions
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<class t_payload_net_handler> |