diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-10-15 18:50:32 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-10-15 18:50:32 +0200 |
| commit | d5ab55b8d7f18f022337760ef19cd010077fc920 (patch) | |
| tree | ed0a2957b9de406d07a564d57f51ad7b027cb2ad /src | |
| parent | Merge pull request #2602 (diff) | |
| parent | protocol: kick idle peers by dropping them (diff) | |
| download | monero-d5ab55b8d7f18f022337760ef19cd010077fc920.tar.xz | |
Merge pull request #2604
0a872798 protocol: kick idle peers by dropping them (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptonote_protocol/cryptonote_protocol_handler.inl | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl index f53b2ee4a..0d9178ac8 100644 --- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl +++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl @@ -51,7 +51,7 @@ #define BLOCK_QUEUE_NBLOCKS_THRESHOLD 10 // chunks of N blocks #define BLOCK_QUEUE_SIZE_THRESHOLD (100*1024*1024) // MB #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 { @@ -1181,6 +1181,7 @@ skip: bool t_cryptonote_protocol_handler<t_core>::kick_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 { if (context.m_state == cryptonote_connection_context::state_synchronizing) @@ -1190,12 +1191,18 @@ skip: if (dt.total_microseconds() > IDLE_PEER_KICK_TIME) { MINFO(context << " kicking idle peer"); - ++context.m_callback_request_count; - m_p2p->request_callback(context); + kick_connections.push_back(context.m_connection_id); } } 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; } //------------------------------------------------------------------------------------------------------------------------ |