nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2604

Browse Source 
0a872798 protocol: kick idle peers by dropping them (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-10-15 18:50:32 +02:00
commit d5ab55b8d7
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
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;
} }
//------------------------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------------------------