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:05 +0000 |
| commit | 58651d16c0bb3e6d05d4c53a25f80b1e464d0c7e (patch) | |
| tree | c141d0925122ecf9d5d0925e6444509e4c8dd9b9 /src | |
| parent | Merge pull request #7102 (diff) | |
| download | monero-58651d16c0bb3e6d05d4c53a25f80b1e464d0c7e.tar.xz | |
p2p: ignore incoming peer list entries when we have them blocked
Diffstat (limited to 'src')
| -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 8000835c4..a19e9d165 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -2085,7 +2085,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> |