diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2019-09-16 19:20:23 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2019-09-16 22:45:45 +0000 |
| commit | 7b076d5170f3299b1933f990e8b35777083c1809 (patch) | |
| tree | 752ecbe4a7eb6d3717bad3f9189ba823a34092e3 /src/p2p/net_node.h | |
| parent | Merge pull request #5861 (diff) | |
| download | monero-7b076d5170f3299b1933f990e8b35777083c1809.tar.xz | |
p2p: fix bans taking port into account
Diffstat (limited to '')
| -rw-r--r-- | src/p2p/net_node.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/p2p/net_node.h b/src/p2p/net_node.h index 255a1fc1f..d7e2e91f5 100644 --- a/src/p2p/net_node.h +++ b/src/p2p/net_node.h @@ -271,7 +271,7 @@ namespace nodetool virtual bool block_subnet(const epee::net_utils::ipv4_network_subnet &subnet, time_t seconds = P2P_IP_BLOCKTIME); virtual bool unblock_subnet(const epee::net_utils::ipv4_network_subnet &subnet); virtual bool is_host_blocked(const epee::net_utils::network_address &address, time_t *seconds) { CRITICAL_REGION_LOCAL(m_blocked_hosts_lock); return !is_remote_host_allowed(address, seconds); } - virtual std::map<epee::net_utils::network_address, time_t> get_blocked_hosts() { CRITICAL_REGION_LOCAL(m_blocked_hosts_lock); return m_blocked_hosts; } + virtual std::map<std::string, time_t> get_blocked_hosts() { CRITICAL_REGION_LOCAL(m_blocked_hosts_lock); return m_blocked_hosts; } virtual std::map<epee::net_utils::ipv4_network_subnet, time_t> get_blocked_subnets() { CRITICAL_REGION_LOCAL(m_blocked_hosts_lock); return m_blocked_subnets; } virtual void add_used_stripe_peer(const typename t_payload_net_handler::connection_context &context); @@ -484,11 +484,11 @@ namespace nodetool std::map<epee::net_utils::zone, network_zone> m_network_zones; - std::map<epee::net_utils::network_address, time_t> m_conn_fails_cache; + std::map<std::string, time_t> m_conn_fails_cache; epee::critical_section m_conn_fails_cache_lock; epee::critical_section m_blocked_hosts_lock; // for both hosts and subnets - std::map<epee::net_utils::network_address, time_t> m_blocked_hosts; + std::map<std::string, time_t> m_blocked_hosts; std::map<epee::net_utils::ipv4_network_subnet, time_t> m_blocked_subnets; epee::critical_section m_host_fails_score_lock; |