From 3697c079fac6546f8b6767bc5a5611ffcff1c1d1 Mon Sep 17 00:00:00 2001 From: SChernykh Date: Mon, 27 Mar 2023 11:47:48 +0200 Subject: [PATCH] Fixed cppcheck error --- src/p2p_server.cpp | 10 ++-------- src/p2p_server.h | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/p2p_server.cpp b/src/p2p_server.cpp index eb4d33f..9a3747f 100644 --- a/src/p2p_server.cpp +++ b/src/p2p_server.cpp @@ -1545,11 +1545,7 @@ bool P2PServer::P2PClient::on_read(char* data, uint32_t size) m_pingTime = std::max(duration_cast(high_resolution_clock::now() - m_lastPeerListRequestTime).count(), 0); --m_peerListPendingRequests; - if (!on_peer_list_response(buf + 1)) { - ban(DEFAULT_BAN_TIME); - server->remove_peer_from_list(this); - return false; - } + on_peer_list_response(buf + 1); } } break; @@ -2181,7 +2177,7 @@ bool P2PServer::P2PClient::on_peer_list_request(const uint8_t*) }); } -bool P2PServer::P2PClient::on_peer_list_response(const uint8_t* buf) +void P2PServer::P2PClient::on_peer_list_response(const uint8_t* buf) { P2PServer* server = static_cast(m_owner); const uint64_t cur_time = seconds_since_epoch(); @@ -2242,8 +2238,6 @@ bool P2PServer::P2PClient::on_peer_list_response(const uint8_t* buf) server->m_peerList.emplace_back(Peer{ is_v6, ip, port, 0, cur_time }); } } - - return true; } bool P2PServer::P2PClient::handle_incoming_block_async(const PoolBlock* block, uint64_t max_time_delta) diff --git a/src/p2p_server.h b/src/p2p_server.h index ac481ee..8302f1b 100644 --- a/src/p2p_server.h +++ b/src/p2p_server.h @@ -104,7 +104,7 @@ public: bool on_block_response(const uint8_t* buf, uint32_t size, const hash& expected_id); bool on_block_broadcast(const uint8_t* buf, uint32_t size, bool compact); bool on_peer_list_request(const uint8_t* buf); - bool on_peer_list_response(const uint8_t* buf); + void on_peer_list_response(const uint8_t* buf); bool handle_incoming_block_async(const PoolBlock* block, uint64_t max_time_delta = 0); void handle_incoming_block(p2pool* pool, PoolBlock& block, const uint32_t reset_counter, const raw_ip& addr, std::vector& missing_blocks);