diff options
author | Riccardo Spagni <ric@spagni.net> | 2017-01-22 11:47:43 -0500 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2017-01-22 11:47:43 -0500 |
commit | add98edfc32ce402dd092a913e35ab9c91aec374 (patch) | |
tree | 5374ed53ec86a1c4dbbfd0385de2a510ff1b1bc0 /src/p2p/net_node.inl | |
parent | Merge pull request #1607 (diff) | |
parent | p2p: always recreate a new peer id on startup (diff) | |
download | monero-add98edfc32ce402dd092a913e35ab9c91aec374.tar.xz |
Merge pull request #1609
4cdf0a35 p2p: always recreate a new peer id on startup (moneromooo-monero)
Diffstat (limited to 'src/p2p/net_node.inl')
-rw-r--r-- | src/p2p/net_node.inl | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 7e3c0213a..0e43d9579 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -173,6 +173,9 @@ namespace nodetool make_default_config(); } + // always recreate a new peer id + make_default_peer_id(); + //at this moment we have hardcoded config m_config.m_net_config.handshake_interval = P2P_DEFAULT_HANDSHAKE_INTERVAL; m_config.m_net_config.packet_max_size = P2P_DEFAULT_PACKET_MAX_SIZE; //20 MB limit @@ -212,13 +215,19 @@ namespace nodetool } //----------------------------------------------------------------------------------- template<class t_payload_net_handler> - bool node_server<t_payload_net_handler>::make_default_config() + bool node_server<t_payload_net_handler>::make_default_peer_id() { m_config.m_peer_id = crypto::rand<uint64_t>(); return true; } //----------------------------------------------------------------------------------- template<class t_payload_net_handler> + bool node_server<t_payload_net_handler>::make_default_config() + { + return make_default_peer_id(); + } + //----------------------------------------------------------------------------------- + template<class t_payload_net_handler> bool node_server<t_payload_net_handler>::block_ip(uint32_t addr, time_t seconds) { CRITICAL_REGION_LOCAL(m_blocked_ips_lock); |