edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-09 17:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8713 from def-/pr-dnsbl

Browse source 
server: Handle dnsbl and other non-critical stuff only on new ticks
This commit is contained in:
heinrich5991 2024-08-12 21:18:49 +00:00 committed by GitHub
parent 26cccb7f51 043480b06e
commit 86f7b6c2fe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 61 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
src/engine/server/server.cpp
View file

@ -2857,54 +2857,6 @@ int CServer::Run()
} }
} }
// handle dnsbl
if(Config()->m_SvDnsbl)
{
for(int ClientId = 0; ClientId < MAX_CLIENTS; ClientId++)
{
if(m_aClients[ClientId].m_State == CClient::STATE_EMPTY)
continue;
if(m_aClients[ClientId].m_DnsblState == CClient::DNSBL_STATE_NONE)
{
// initiate dnsbl lookup
InitDnsbl(ClientId);
}
else if(m_aClients[ClientId].m_DnsblState == CClient::DNSBL_STATE_PENDING &&
m_aClients[ClientId].m_pDnsblLookup->State() == IJob::STATE_DONE)
{
if(m_aClients[ClientId].m_pDnsblLookup->Result() != 0)
{
// entry not found -> whitelisted
m_aClients[ClientId].m_DnsblState = CClient::DNSBL_STATE_WHITELISTED;
char aAddrStr[NETADDR_MAXSTRSIZE];
net_addr_str(m_NetServer.ClientAddr(ClientId), aAddrStr, sizeof(aAddrStr), true);
str_format(aBuf, sizeof(aBuf), "ClientId=%d addr=<{%s}> secure=%s whitelisted", ClientId, aAddrStr, m_NetServer.HasSecurityToken(ClientId) ? "yes" : "no");
Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "dnsbl", aBuf);
}
else
{
// entry found -> blacklisted
m_aClients[ClientId].m_DnsblState = CClient::DNSBL_STATE_BLACKLISTED;
// console output
char aAddrStr[NETADDR_MAXSTRSIZE];
net_addr_str(m_NetServer.ClientAddr(ClientId), aAddrStr, sizeof(aAddrStr), true);
str_format(aBuf, sizeof(aBuf), "ClientId=%d addr=<{%s}> secure=%s blacklisted", ClientId, aAddrStr, m_NetServer.HasSecurityToken(ClientId) ? "yes" : "no");
Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "dnsbl", aBuf);
if(Config()->m_SvDnsblBan)
{
m_NetServer.NetBan()->BanAddr(m_NetServer.ClientAddr(ClientId), 60, Config()->m_SvDnsblBanReason, false);
}
}
}
}
}
while(t > TickStartTime(m_CurrentGameTick + 1)) while(t > TickStartTime(m_CurrentGameTick + 1))
{ {
GameServer()->OnPreTickTeehistorian(); GameServer()->OnPreTickTeehistorian();
@ -2968,30 +2920,77 @@ int CServer::Run()
UpdateClientRconCommands(); UpdateClientRconCommands();
m_Fifo.Update(); m_Fifo.Update();
}
// master server stuff // master server stuff
m_pRegister->Update(); m_pRegister->Update();
if(m_ServerInfoNeedsUpdate) if(m_ServerInfoNeedsUpdate)
UpdateServerInfo(); UpdateServerInfo();
Antibot()->OnEngineTick(); Antibot()->OnEngineTick();
if(!NonActive) // handle dnsbl
PumpNetwork(PacketWaiting); if(Config()->m_SvDnsbl)
for(int i = 0; i < MAX_CLIENTS; ++i)
{
if(m_aClients[i].m_State == CClient::STATE_REDIRECTED)
{ {
if(time_get() > m_aClients[i].m_RedirectDropTime) for(int ClientId = 0; ClientId < MAX_CLIENTS; ClientId++)
{ {
m_NetServer.Drop(i, "redirected"); if(m_aClients[ClientId].m_State == CClient::STATE_EMPTY)
continue;
if(m_aClients[ClientId].m_DnsblState == CClient::DNSBL_STATE_NONE)
{
// initiate dnsbl lookup
InitDnsbl(ClientId);
}
else if(m_aClients[ClientId].m_DnsblState == CClient::DNSBL_STATE_PENDING &&
m_aClients[ClientId].m_pDnsblLookup->State() == IJob::STATE_DONE)
{
if(m_aClients[ClientId].m_pDnsblLookup->Result() != 0)
{
// entry not found -> whitelisted
m_aClients[ClientId].m_DnsblState = CClient::DNSBL_STATE_WHITELISTED;
char aAddrStr[NETADDR_MAXSTRSIZE];
net_addr_str(m_NetServer.ClientAddr(ClientId), aAddrStr, sizeof(aAddrStr), true);
str_format(aBuf, sizeof(aBuf), "ClientId=%d addr=<{%s}> secure=%s whitelisted", ClientId, aAddrStr, m_NetServer.HasSecurityToken(ClientId) ? "yes" : "no");
Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "dnsbl", aBuf);
}
else
{
// entry found -> blacklisted
m_aClients[ClientId].m_DnsblState = CClient::DNSBL_STATE_BLACKLISTED;
// console output
char aAddrStr[NETADDR_MAXSTRSIZE];
net_addr_str(m_NetServer.ClientAddr(ClientId), aAddrStr, sizeof(aAddrStr), true);
str_format(aBuf, sizeof(aBuf), "ClientId=%d addr=<{%s}> secure=%s blacklisted", ClientId, aAddrStr, m_NetServer.HasSecurityToken(ClientId) ? "yes" : "no");
Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "dnsbl", aBuf);
if(Config()->m_SvDnsblBan)
{
m_NetServer.NetBan()->BanAddr(m_NetServer.ClientAddr(ClientId), 60, Config()->m_SvDnsblBanReason, false);
}
}
}
}
}
for(int i = 0; i < MAX_CLIENTS; ++i)
{
if(m_aClients[i].m_State == CClient::STATE_REDIRECTED)
{
if(time_get() > m_aClients[i].m_RedirectDropTime)
{
m_NetServer.Drop(i, "redirected");
}
} }
} }
} }
if(!NonActive)
PumpNetwork(PacketWaiting);
NonActive = true; NonActive = true;
for(const auto &Client : m_aClients) for(const auto &Client : m_aClients)
{ {