tiamak/p2pool-salvium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P2PServer: don't add banned peers back to the peer list

Browse Source
This commit is contained in:
SChernykh
2021-08-27 16:36:06 +02:00
parent 3804bfb0ba
commit 81a12158fc
3 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/tcp_server.inl
View File

@@ -312,18 +312,26 @@ void TCPServer<READ_BUF_SIZE, WRITE_BUF_SIZE>::on_connect_failed(bool, const raw
{
}
template<size_t READ_BUF_SIZE, size_t WRITE_BUF_SIZE>
bool TCPServer<READ_BUF_SIZE, WRITE_BUF_SIZE>::is_banned(const raw_ip& ip)
{
MutexLock lock(m_bansLock);
auto it = m_bans.find(ip);
if ((it != m_bans.end()) && (time(nullptr) < it->second)) {
return true;
}
return false;
}
template<size_t READ_BUF_SIZE, size_t WRITE_BUF_SIZE>
bool TCPServer<READ_BUF_SIZE, WRITE_BUF_SIZE>::connect_to_peer_nolock(Client* client, bool is_v6, const sockaddr* addr)
{
{
MutexLock lock(m_bansLock);
auto it = m_bans.find(client->m_addr);
if ((it != m_bans.end()) && (time(nullptr) < it->second)) {
LOGINFO(5, "peer " << log::Gray() << static_cast<char*>(client->m_addrString) << log::NoColor() << " is banned, not connecting to it");
m_preallocatedClients.push_back(client);
return false;
}
if (is_banned(client->m_addr)) {
LOGINFO(5, "peer " << log::Gray() << static_cast<char*>(client->m_addrString) << log::NoColor() << " is banned, not connecting to it");
m_preallocatedClients.push_back(client);
return false;
}
client->m_isV6 = is_v6;
@@ -719,15 +727,10 @@ void TCPServer<READ_BUF_SIZE, WRITE_BUF_SIZE>::on_new_client_nolock(uv_stream_t*
client->m_isIncoming = false;
}
{
MutexLock lock(m_bansLock);
auto it = m_bans.find(client->m_addr);
if ((it != m_bans.end()) && (time(nullptr) < it->second)) {
LOGINFO(5, "peer " << log::Gray() << static_cast<char*>(client->m_addrString) << log::NoColor() << " is banned, disconnecting");
client->close();
return;
}
if (is_banned(client->m_addr)) {
LOGINFO(5, "peer " << log::Gray() << static_cast<char*>(client->m_addrString) << log::NoColor() << " is banned, disconnecting");
client->close();
return;
}
if (client->m_owner->m_finished.load() || !client->on_connect()) {