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

Tell why DNSBL isn't allowing to vote (fixes #2466)

Browse source
This commit is contained in:
def 2020-07-07 23:08:46 +02:00
parent b44ff4cc56
commit 66c7bf8851
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/server.h
View file

@ -223,6 +223,8 @@ public:
virtual int* GetIdMap(int ClientID) = 0; virtual int* GetIdMap(int ClientID) = 0;
virtual bool DnsblWhite(int ClientID) = 0; virtual bool DnsblWhite(int ClientID) = 0;
virtual bool DnsblPending(int ClientID) = 0;
virtual bool DnsblBlack(int ClientID) = 0;
virtual const char *GetAnnouncementLine(char const *FileName) = 0; virtual const char *GetAnnouncementLine(char const *FileName) = 0;
virtual bool ClientPrevIngame(int ClientID) = 0; virtual bool ClientPrevIngame(int ClientID) = 0;
virtual const char *GetNetErrorString(int ClientID) = 0; virtual const char *GetNetErrorString(int ClientID) = 0;

8
src/engine/server/server.h
View file

@ -442,6 +442,14 @@ public:
return m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_NONE || return m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_NONE ||
m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_WHITELISTED; m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_WHITELISTED;
} }
bool DnsblPending(int ClientID)
{
return m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_PENDING;
}
bool DnsblBlack(int ClientID)
{
return m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_BLACKLISTED;
}
void AuthRemoveKey(int KeySlot); void AuthRemoveKey(int KeySlot);
bool ClientPrevIngame(int ClientID) { return m_aPrevStates[ClientID] == CClient::STATE_INGAME; }; bool ClientPrevIngame(int ClientID) { return m_aPrevStates[ClientID] == CClient::STATE_INGAME; };

13
src/game/server/gamecontext.cpp
View file

@ -3894,12 +3894,19 @@ bool CGameContext::RateLimitPlayerVote(int ClientID)
return true; return true;
} }
if (g_Config.m_SvDnsblVote && !m_pServer->DnsblWhite(ClientID) && Server()->DistinctClientCount() > 1) if(g_Config.m_SvDnsblVote && Server()->DistinctClientCount() > 1)
{ {
// blacklisted by dnsbl if(m_pServer->DnsblPending(ClientID))
SendChatTarget(ClientID, "You are not allowed to vote due to DNSBL."); {
SendChatTarget(ClientID, "You are not allowed to vote due to pending DNSBL request. Try again in ~30 seconds.");
return true; return true;
} }
else if(m_pServer->DnsblBlack(ClientID))
{
SendChatTarget(ClientID, "You are not allowed to vote due to DNSBL. Try connecting without a VPN.");
return true;
}
}
if(g_Config.m_SvSpamprotection && pPlayer->m_LastVoteTry && pPlayer->m_LastVoteTry + TickSpeed * 3 > Now) if(g_Config.m_SvSpamprotection && pPlayer->m_LastVoteTry && pPlayer->m_LastVoteTry + TickSpeed * 3 > Now)
return true; return true;