aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-03-12 13:44:34 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-03-12 13:48:58 +0000
commit474e4c00f0813070de4b85abc6c58ef5fe395df1 (patch)
tree339b285f53737880b4db281ed3e6f4c3db1d5780 /src
parentMerge pull request #712 (diff)
downloadmonero-474e4c00f0813070de4b85abc6c58ef5fe395df1.tar.xz
p2p: lock access to the blocked ips map
Diffstat (limited to 'src')
-rw-r--r--src/p2p/net_node.h2
-rw-r--r--src/p2p/net_node_common.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/p2p/net_node.h b/src/p2p/net_node.h
index 260dd813d..5943c248f 100644
--- a/src/p2p/net_node.h
+++ b/src/p2p/net_node.h
@@ -120,7 +120,7 @@ namespace nodetool
void delete_connections(size_t count);
virtual bool block_ip(uint32_t adress, time_t seconds = P2P_IP_BLOCKTIME);
virtual bool unblock_ip(uint32_t address);
- virtual std::map<uint32_t, time_t> get_blocked_ips() const { return m_blocked_ips; }
+ virtual std::map<uint32_t, time_t> get_blocked_ips() { CRITICAL_REGION_LOCAL(m_blocked_ips_lock); return m_blocked_ips; }
private:
const std::vector<std::string> m_seed_nodes_list =
{ "seeds.moneroseeds.se"
diff --git a/src/p2p/net_node_common.h b/src/p2p/net_node_common.h
index 68b0bd1ee..5e7645365 100644
--- a/src/p2p/net_node_common.h
+++ b/src/p2p/net_node_common.h
@@ -52,7 +52,7 @@ namespace nodetool
virtual void for_each_connection(std::function<bool(t_connection_context&, peerid_type)> f)=0;
virtual bool block_ip(uint32_t adress, time_t seconds = 0)=0;
virtual bool unblock_ip(uint32_t adress)=0;
- virtual std::map<uint32_t, time_t> get_blocked_ips()const=0;
+ virtual std::map<uint32_t, time_t> get_blocked_ips()=0;
virtual bool add_ip_fail(uint32_t adress)=0;
};
@@ -96,7 +96,7 @@ namespace nodetool
{
return true;
}
- virtual std::map<uint32_t, time_t> get_blocked_ips() const
+ virtual std::map<uint32_t, time_t> get_blocked_ips()
{
return std::map<uint32_t, time_t>();
}