diff options
Diffstat (limited to 'src/engine/shared')
| -rw-r--r-- | src/engine/shared/config_variables.h | 1 | ||||
| -rw-r--r-- | src/engine/shared/network.h | 12 | ||||
| -rw-r--r-- | src/engine/shared/network_server.cpp | 61 |
3 files changed, 74 insertions, 0 deletions
diff --git a/src/engine/shared/config_variables.h b/src/engine/shared/config_variables.h index eb7f9ca7..5d34294d 100644 --- a/src/engine/shared/config_variables.h +++ b/src/engine/shared/config_variables.h @@ -82,6 +82,7 @@ MACRO_CONFIG_INT(SvRegister, sv_register, 1, 0, 1, CFGFLAG_SERVER, "Register ser MACRO_CONFIG_STR(SvRconPassword, sv_rcon_password, 32, "", CFGFLAG_SERVER, "Remote console password") MACRO_CONFIG_INT(SvRconMaxTries, sv_rcon_max_tries, 3, 0, 100, CFGFLAG_SERVER, "Maximum number of tries for remote console authentication") MACRO_CONFIG_INT(SvRconBantime, sv_rcon_bantime, 5, 0, 1440, CFGFLAG_SERVER, "The time a client gets banned if remote console authentication fails. 0 makes it just use kick") +MACRO_CONFIG_INT(SvGlobalBantime, sv_global_ban_time, 60, 0, 1440, CFGFLAG_SERVER, "The time a client gets banned if the ban server reports it. 0 to disable") MACRO_CONFIG_INT(Debug, debug, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SERVER, "Debug mode") MACRO_CONFIG_INT(DbgStress, dbg_stress, 0, 0, 0, CFGFLAG_CLIENT|CFGFLAG_SERVER, "Stress systems") diff --git a/src/engine/shared/network.h b/src/engine/shared/network.h index f344049e..075fc8e5 100644 --- a/src/engine/shared/network.h +++ b/src/engine/shared/network.h @@ -214,6 +214,10 @@ public: class CNetServer { public: + enum + { + MAX_BANMASTERS=16 + }; struct CBanInfo { NETADDR m_Addr; @@ -253,6 +257,9 @@ private: CBan *m_BanPool_FirstFree; CBan *m_BanPool_FirstUsed; + NETADDR m_aBanmasters[MAX_BANMASTERS]; + int m_NumBanmasters; + NETFUNC_NEWCLIENT m_pfnNewClient; NETFUNC_DELCLIENT m_pfnDelClient; void *m_UserPtr; @@ -289,6 +296,11 @@ public: // void SetMaxClientsPerIP(int Max); + int BanmasterAdd(const char *pAddrStr); + int BanmasterNum() const; + NETADDR* BanmasterGet(int Index); + int BanmasterCheck(NETADDR *pAddr); + void BanmastersClear(); }; diff --git a/src/engine/shared/network_server.cpp b/src/engine/shared/network_server.cpp index 3078ab9f..21da1e36 100644 --- a/src/engine/shared/network_server.cpp +++ b/src/engine/shared/network_server.cpp @@ -1,6 +1,7 @@ /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */ /* If you are missing that file, acquire a complete release at teeworlds.com. */ #include <base/system.h> +#include <banmaster/banmaster.h> #include "network.h" #define MACRO_LIST_LINK_FIRST(Object, First, Prev, Next) \ @@ -352,6 +353,22 @@ int CNetServer::Recv(CNetChunk *pChunk) // client that wants to connect if(!Found) { + CNetChunk Packet; + char aBuffer[sizeof(BANMASTER_IPCHECK) + NETADDR_MAXSTRSIZE]; + mem_copy(aBuffer, BANMASTER_IPCHECK, sizeof(BANMASTER_IPCHECK)); + net_addr_str(&Addr, aBuffer + sizeof(BANMASTER_IPCHECK), sizeof(aBuffer) - sizeof(BANMASTER_IPCHECK)); + + Packet.m_ClientID = -1; + Packet.m_Flags = NETSENDFLAG_CONNLESS; + Packet.m_DataSize = str_length(aBuffer) + 1; + Packet.m_pData = aBuffer; + + for(int i = 0; i < m_NumBanmasters; i++) + { + Packet.m_Address = m_aBanmasters[i]; + Send(&Packet); + } + // only allow a specific number of players with the same ip NETADDR ThisAddr = Addr, OtherAddr; int FoundAddr = 1; @@ -383,6 +400,7 @@ int CNetServer::Recv(CNetChunk *pChunk) m_aSlots[i].m_Connection.Feed(&m_RecvUnpacker.m_Data, &Addr); if(m_pfnNewClient) m_pfnNewClient(i, m_UserPtr); + break; } } @@ -461,3 +479,46 @@ void CNetServer::SetMaxClientsPerIP(int Max) m_MaxClientsPerIP = Max; } + +int CNetServer::BanmasterAdd(const char *pAddrStr) +{ + if(m_NumBanmasters >= MAX_BANMASTERS) + return 2; + + if(net_host_lookup(pAddrStr, &m_aBanmasters[m_NumBanmasters], NETTYPE_IPV4)) + return 1; + + if(m_aBanmasters[m_NumBanmasters].port == 0) + m_aBanmasters[m_NumBanmasters].port = BANMASTER_PORT; + + m_NumBanmasters++; + return 0; +} + +int CNetServer::BanmasterNum() const +{ + return m_NumBanmasters; +} + +NETADDR* CNetServer::BanmasterGet(int Index) +{ + if(Index < 0 || Index >= m_NumBanmasters) + return 0; + + return &m_aBanmasters[Index]; +} + +int CNetServer::BanmasterCheck(NETADDR *pAddr) +{ + for(int i = 0; i < m_NumBanmasters; i++) + if(net_addr_comp(&m_aBanmasters[i], pAddr) == 0) + return i; + + return -1; +} + +void CNetServer::BanmastersClear() +{ + m_NumBanmasters = 0; +} + |