4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-14 12:26:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

protocol: kick idle peers by dropping them

Browse Source 
This is safer, as we don't risk break expectations (eg, requesting
block hashes and then receiving a late set of blocks). Dropping a
connection means another will be attempted in a fresh state.

Also bump the kick timeout to 5 minutes, to ensure we only kick
really idle peers.
This commit is contained in:
moneromooo-monero 2017-10-04 21:53:06 +01:00
parent 86e9de588c
commit 0a872798bc
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View File

@ -51,7 +51,7 @@
#define BLOCK_QUEUE_NBLOCKS_THRESHOLD 10 // chunks of N blocks #define BLOCK_QUEUE_NBLOCKS_THRESHOLD 10 // chunks of N blocks
#define BLOCK_QUEUE_SIZE_THRESHOLD (100*1024*1024) // MB #define BLOCK_QUEUE_SIZE_THRESHOLD (100*1024*1024) // MB
#define REQUEST_NEXT_SCHEDULED_SPAN_THRESHOLD (5 * 1000000) // microseconds #define REQUEST_NEXT_SCHEDULED_SPAN_THRESHOLD (5 * 1000000) // microseconds
#define IDLE_PEER_KICK_TIME (45 * 1000000) // microseconds #define IDLE_PEER_KICK_TIME (600 * 1000000) // microseconds
namespace cryptonote namespace cryptonote
{ {
@ -1181,6 +1181,7 @@ skip:
bool t_cryptonote_protocol_handler<t_core>::kick_idle_peers() bool t_cryptonote_protocol_handler<t_core>::kick_idle_peers()
{ {
MTRACE("Checking for idle peers..."); MTRACE("Checking for idle peers...");
std::vector<boost::uuids::uuid> kick_connections;
m_p2p->for_each_connection([&](cryptonote_connection_context& context, nodetool::peerid_type peer_id, uint32_t support_flags)->bool m_p2p->for_each_connection([&](cryptonote_connection_context& context, nodetool::peerid_type peer_id, uint32_t support_flags)->bool
{ {
if (context.m_state == cryptonote_connection_context::state_synchronizing) if (context.m_state == cryptonote_connection_context::state_synchronizing)
@ -1190,12 +1191,18 @@ skip:
if (dt.total_microseconds() > IDLE_PEER_KICK_TIME) if (dt.total_microseconds() > IDLE_PEER_KICK_TIME)
{ {
MINFO(context << " kicking idle peer"); MINFO(context << " kicking idle peer");
++context.m_callback_request_count; kick_connections.push_back(context.m_connection_id);
m_p2p->request_callback(context);
} }
} }
return true; return true;
}); });
for (const boost::uuids::uuid &conn_id: kick_connections)
{
m_p2p->for_connection(conn_id, [this](cryptonote_connection_context& context, nodetool::peerid_type peer_id, uint32_t support_flags) {
drop_connection(context, false, false);
return true;
});
}
return true; return true;
} }
//------------------------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------------------------