Ecosystem/p2pool
1
0
Fork 0
mirror of https://github.com/SChernykh/p2pool.git synced 2024-12-23 03:49:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

P2PServer: relaxed peer list request restriction

Browse source
This commit is contained in:
SChernykh 2022-02-22 11:06:12 +01:00
parent a73b4616a4
commit 2209e0cc70
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/p2p_server.cpp
View file

@ -989,7 +989,8 @@ P2PServer::P2PClient::P2PClient()
, m_handshakeComplete(false) , m_handshakeComplete(false)
, m_handshakeInvalid(false) , m_handshakeInvalid(false)
, m_listenPort(-1) , m_listenPort(-1)
, m_prevIncomingPeerListRequest(0) , m_fastPeerListRequestCount(0)
, m_prevIncomingPeerListRequest{}
, m_nextOutgoingPeerListRequest(0) , m_nextOutgoingPeerListRequest(0)
, m_lastPeerListRequestTime{} , m_lastPeerListRequestTime{}
, m_peerListPendingRequests(0) , m_peerListPendingRequests(0)
@ -1017,7 +1018,8 @@ void P2PServer::P2PClient::reset()
m_handshakeComplete = false; m_handshakeComplete = false;
m_handshakeInvalid = false; m_handshakeInvalid = false;
m_listenPort = -1; m_listenPort = -1;
m_prevIncomingPeerListRequest = 0; m_fastPeerListRequestCount = 0;
m_prevIncomingPeerListRequest = {};
m_nextOutgoingPeerListRequest = 0; m_nextOutgoingPeerListRequest = 0;
m_lastPeerListRequestTime = {}; m_lastPeerListRequestTime = {};
m_peerListPendingRequests = 0; m_peerListPendingRequests = 0;
@ -1740,13 +1742,18 @@ bool P2PServer::P2PClient::on_block_broadcast(const uint8_t* buf, uint32_t size)
bool P2PServer::P2PClient::on_peer_list_request(const uint8_t*) bool P2PServer::P2PClient::on_peer_list_request(const uint8_t*)
{ {
using namespace std::chrono;
P2PServer* server = static_cast<P2PServer*>(m_owner); P2PServer* server = static_cast<P2PServer*>(m_owner);
const time_t cur_time = time(nullptr); const auto cur_time = steady_clock::now();
// Allow peer list requests no more than once every 30 seconds // Allow peer list requests no more than once every 30 seconds
if (cur_time < m_prevIncomingPeerListRequest + 30) { if (duration_cast<seconds>(cur_time - m_prevIncomingPeerListRequest).count() < 30) {
LOGWARN(4, "peer " << log::Gray() << static_cast<char*>(m_addrString) << log::NoColor() << " is sending PEER_LIST_REQUEST too often"); ++m_fastPeerListRequestCount;
return false; if (m_fastPeerListRequestCount >= 3) {
LOGWARN(4, "peer " << log::Gray() << static_cast<char*>(m_addrString) << log::NoColor() << " is sending PEER_LIST_REQUEST too often");
return false;
}
} }
m_prevIncomingPeerListRequest = cur_time; m_prevIncomingPeerListRequest = cur_time;

3
src/p2p_server.h
View file

@ -110,7 +110,8 @@ public:
bool m_handshakeInvalid; bool m_handshakeInvalid;
int m_listenPort; int m_listenPort;
time_t m_prevIncomingPeerListRequest; uint32_t m_fastPeerListRequestCount;
std::chrono::steady_clock::time_point m_prevIncomingPeerListRequest;
uint64_t m_nextOutgoingPeerListRequest; uint64_t m_nextOutgoingPeerListRequest;
std::chrono::high_resolution_clock::time_point m_lastPeerListRequestTime; std::chrono::high_resolution_clock::time_point m_lastPeerListRequestTime;
int m_peerListPendingRequests; int m_peerListPendingRequests;