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

GreYFoX fix of ban

Browse source
This commit is contained in:
btd 2010-08-07 21:16:48 +04:00
parent 84cf23203d
commit e416c38ad1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/engine/shared/network_server.cpp
View file

@ -161,7 +161,7 @@ int CNetServer::BanAdd(NETADDR Addr, int Seconds, const char * Reason)
if(pBan)
{
// adjust the ban
if (pBan->m_Info.m_Expires > Seconds)
if (pBan->m_Info.m_Expires > Seconds || pBan->m_Info.m_Expires == 0xffffffff)
return 0;
pBan->m_Info.m_Expires = Stamp;
@ -260,7 +260,7 @@ int CNetServer::BanAddNoDrop(NETADDR Addr, int Seconds, const char *Reason)
if(pBan)
{
// adjust the ban
if (pBan->m_Info.m_Expires > Seconds)
if (pBan->m_Info.m_Expires > Seconds || pBan->m_Info.m_Expires == 0xffffffff)
return 0;
pBan->m_Info.m_Expires = Stamp;
@ -379,7 +379,7 @@ int CNetServer::Recv(CNetChunk *pChunk)
{
// banned, reply with a message
char BanStr[128];
if(pBan->m_Info.m_Expires)
if(pBan->m_Info.m_Expires && (pBan->m_Info.m_Expires!=0xffffffff))
{
int Mins = ((pBan->m_Info.m_Expires - Now))/60;
if(Mins > 1)
@ -388,7 +388,7 @@ int CNetServer::Recv(CNetChunk *pChunk)
str_format(BanStr, sizeof(BanStr), "Banned for %d minute(s) for %s", (pBan->m_Info.m_Expires - Now), pBan->m_Info.m_Reason);
}
else
str_format(BanStr, sizeof(BanStr), "banned for life. %s", pBan->m_Info.m_Reason);
str_format(BanStr, sizeof(BanStr), "Banned for life for %s", pBan->m_Info.m_Reason);
CNetBase::SendControlMsg(m_Socket, &Addr, 0, NET_CTRLMSG_CLOSE, BanStr, str_length(BanStr)+1);
continue;
}