From 8b62b051c8c5de5af8af3aa06981ce28f8c62420 Mon Sep 17 00:00:00 2001 From: heinrich5991 Date: Thu, 21 Apr 2011 17:36:22 +0200 Subject: banmaster for 0.6 with ipv6 support --- bam.lua | 7 +- banmasters.cfg | 2 + bans.cfg | 1 + scripts/make_release.py | 1 + src/banmaster/banmaster.cpp | 260 +++++++++++++++++++++++++++++++++++ src/banmaster/banmaster.h | 12 ++ src/engine/server/server.cpp | 79 ++++++++++- src/engine/server/server.h | 3 + src/engine/shared/config_variables.h | 1 + src/engine/shared/network.h | 12 ++ src/engine/shared/network_server.cpp | 61 ++++++++ 11 files changed, 437 insertions(+), 2 deletions(-) create mode 100644 banmasters.cfg create mode 100644 bans.cfg create mode 100644 src/banmaster/banmaster.cpp create mode 100644 src/banmaster/banmaster.h diff --git a/bam.lua b/bam.lua index 0c7c2f78..9c827d0d 100644 --- a/bam.lua +++ b/bam.lua @@ -216,6 +216,7 @@ function build(settings) versionserver = Compile(settings, Collect("src/versionsrv/*.cpp")) masterserver = Compile(settings, Collect("src/mastersrv/*.cpp")) + banmaster = Compile(settings, Collect("src/banmaster/*.cpp")) game_shared = Compile(settings, Collect("src/game/*.cpp"), nethash, network_source) game_client = Compile(settings, CollectRecursive("src/game/client/*.cpp"), client_content_source) game_server = Compile(settings, CollectRecursive("src/game/server/*.cpp"), server_content_source) @@ -256,6 +257,9 @@ function build(settings) masterserver_exe = Link(server_settings, "mastersrv", masterserver, engine, zlib) + banmaster_exe = Link(server_settings, "banmaster", banmaster, + engine, zlib) + -- make targets c = PseudoTarget("client".."_"..settings.config_name, client_exe, client_depends) s = PseudoTarget("server".."_"..settings.config_name, server_exe, serverlaunch) @@ -263,9 +267,10 @@ function build(settings) v = PseudoTarget("versionserver".."_"..settings.config_name, versionserver_exe) m = PseudoTarget("masterserver".."_"..settings.config_name, masterserver_exe) + b = PseudoTarget("banmaster".."_"..settings.config_name, banmaster_exe) t = PseudoTarget("tools".."_"..settings.config_name, tools) - all = PseudoTarget(settings.config_name, c, s, v, m, t) + all = PseudoTarget(settings.config_name, c, s, v, m, b, t) return all end diff --git a/banmasters.cfg b/banmasters.cfg new file mode 100644 index 00000000..2d943482 --- /dev/null +++ b/banmasters.cfg @@ -0,0 +1,2 @@ +clear_banmasters +add_banmaster banmaster.kottnet.net diff --git a/bans.cfg b/bans.cfg new file mode 100644 index 00000000..a32469c6 --- /dev/null +++ b/bans.cfg @@ -0,0 +1 @@ +unban_all diff --git a/scripts/make_release.py b/scripts/make_release.py index 6dce1cac..32af2eee 100644 --- a/scripts/make_release.py +++ b/scripts/make_release.py @@ -62,6 +62,7 @@ print("adding files") shutil.copy("readme.txt", package_dir) shutil.copy("license.txt", package_dir) shutil.copy("storage.cfg", package_dir) +shutil.copy("banmasters.cfg", package_dir) if include_data and not use_bundle: os.mkdir(os.path.join(package_dir, "data")) diff --git a/src/banmaster/banmaster.cpp b/src/banmaster/banmaster.cpp new file mode 100644 index 00000000..8c7014ec --- /dev/null +++ b/src/banmaster/banmaster.cpp @@ -0,0 +1,260 @@ +/* (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 +#include +#include +#include + +#include "banmaster.h" + +enum +{ + MAX_BANS=1024, + BAN_REREAD_TIME=300, + CFGFLAG_BANMASTER=16 +}; + +static const char BANMASTER_BANFILE[] = "bans.cfg"; + +struct CBan +{ + NETADDR m_Address; + char m_aReason[256]; + int64 m_Expire; +}; + +static CBan m_aBans[MAX_BANS]; +static int m_NumBans = 0; +static CNetClient m_Net; +static IConsole *m_pConsole; +static char m_aBindAddr[64] = ""; + +CBan* CheckBan(NETADDR *pCheck) +{ + for(int i = 0; i < m_NumBans; i++) + if(net_addr_comp(&m_aBans[i].m_Address, pCheck) == 0) + return &m_aBans[i]; + + return 0; +} + +int SendResponse(NETADDR *pAddr, NETADDR *pCheck) +{ + static char aIpBan[sizeof(BANMASTER_IPBAN) + NETADDR_MAXSTRSIZE] = { 0 }; + static char *pIpBanContent = aIpBan + sizeof(BANMASTER_IPBAN); + if (!aIpBan[0]) + mem_copy(aIpBan, BANMASTER_IPBAN, sizeof(BANMASTER_IPBAN)); + + static CNetChunk p; + + p.m_ClientID = -1; + p.m_Address = *pAddr; + p.m_Flags = NETSENDFLAG_CONNLESS; + + CBan* pBan = CheckBan(pCheck); + if(pBan) + { + net_addr_str(pCheck, pIpBanContent, NETADDR_MAXSTRSIZE); + char *pIpBanReason = pIpBanContent + (str_length(pIpBanContent) + 1); + str_copy(pIpBanReason, pBan->m_aReason, 256); + + p.m_pData = aIpBan; + p.m_DataSize = sizeof(BANMASTER_IPBAN) + str_length(pIpBanContent) + 1 + str_length(pIpBanReason) + 1; + m_Net.Send(&p); + return 1; + } + + return 0; + /*else + { + p.m_DataSize = sizeof(BANMASTER_IPOK); + p.m_pData = BANMASTER_IPOK; + m_Net.Send(&p); + return 0; + }*/ +} + +void AddBan(NETADDR *pAddr, const char *pReason) +{ + pAddr->port = 0; + + CBan *pBan = CheckBan(pAddr); + char aAddressStr[NETADDR_MAXSTRSIZE]; + net_addr_str(pAddr, aAddressStr, sizeof(aAddressStr)); + + if(pBan) + { + char aAddressStr[NETADDR_MAXSTRSIZE]; + net_addr_str(pAddr, aAddressStr, sizeof(aAddressStr)); + dbg_msg("banmaster", "updated ban, ip=%s oldreason='%s' reason='%s'", aAddressStr, pBan->m_aReason, pReason); + + str_copy(pBan->m_aReason, pReason, sizeof(m_aBans[m_NumBans].m_aReason)); + pBan->m_Expire = -1; + } + else + { + if(m_NumBans == MAX_BANS) + { + dbg_msg("banmaster", "error: banmaster is full"); + return; + } + + m_aBans[m_NumBans].m_Address = *pAddr; + str_copy(m_aBans[m_NumBans].m_aReason, pReason, sizeof(m_aBans[m_NumBans].m_aReason)); + m_aBans[m_NumBans].m_Expire = -1; + + dbg_msg("banmaster", "added ban, ip=%s reason='%s'", aAddressStr, m_aBans[m_NumBans].m_aReason); + + m_NumBans++; + } +} + +void ClearBans() +{ + m_NumBans = 0; +} + +void PurgeBans() +{ + int64 Now = time_get(); + int i = 0; + while(i < m_NumBans) + { + if(m_aBans[i].m_Expire != -1 && m_aBans[i].m_Expire < Now) + { + // remove ban + char aBuf[NETADDR_MAXSTRSIZE]; + net_addr_str(&m_aBans[i].m_Address, aBuf, sizeof(aBuf)); + dbg_msg("banmaster", "ban expired, ip=%s reason='%s'", aBuf, m_aBans[i].m_aReason); + m_aBans[i] = m_aBans[m_NumBans - 1]; + m_NumBans--; + } + else + i++; + } +} + +void ConBan(IConsole::IResult *pResult, void *pUser) +{ + NETADDR Addr; + const char *pStr = pResult->GetString(0); + const char *pReason = ""; + + if(pResult->NumArguments() > 1) + pReason = pResult->GetString(1); + + if(!net_addr_from_str(&Addr, pStr)) + AddBan(&Addr, pReason); + else + dbg_msg("banmaster", "invalid network address to ban, str='%s'", pStr); +} + +void ConUnbanAll(IConsole::IResult *pResult, void *pUser) +{ + ClearBans(); +} + +void ConSetBindAddr(IConsole::IResult *pResult, void *pUser) +{ + if(m_aBindAddr[0]) + return; + str_copy(m_aBindAddr, pResult->GetString(0), sizeof(m_aBindAddr)); + dbg_msg("banmaster/network", "bound to %s", m_aBindAddr); +} + +void StandardOutput(const char *pLine, void *pUser) +{ +} + +int main(int argc, const char **argv) // ignore_convention +{ + int64 LastUpdate = time_get(); + + dbg_logger_stdout(); + net_init(); + + IKernel *pKernel = IKernel::Create(); + IStorage *pStorage = CreateStorage("Teeworlds", argc, argv); // ignore_convention + + m_pConsole = CreateConsole(CFGFLAG_BANMASTER); + m_pConsole->RegisterPrintCallback(StandardOutput, 0); + m_pConsole->Register("ban", "s?r", CFGFLAG_BANMASTER, ConBan, 0, "Bans the specified ip"); + m_pConsole->Register("unban_all", "", CFGFLAG_BANMASTER, ConUnbanAll, 0, "Unbans all ips"); + m_pConsole->Register("bind", "s", CFGFLAG_BANMASTER, ConSetBindAddr, 0, "Binds to the specified address"); + + { + bool RegisterFail = false; + + RegisterFail = RegisterFail || !pKernel->RegisterInterface(m_pConsole); + RegisterFail = RegisterFail || !pKernel->RegisterInterface(pStorage); + + if(RegisterFail) + return -1; + } + + m_pConsole->ExecuteFile(BANMASTER_BANFILE); + + NETADDR BindAddr; + if(m_aBindAddr[0] && net_host_lookup(m_aBindAddr, &BindAddr, NETTYPE_IPV4) == 0) + { + if(BindAddr.port == 0) + BindAddr.port = BANMASTER_PORT; + } + else + { + mem_zero(&BindAddr, sizeof(BindAddr)); + BindAddr.port = BANMASTER_PORT; + } + + m_Net.Open(BindAddr, 0); + // TODO: check socket for errors + + dbg_msg("banmaster", "started"); + + while(1) + { + m_Net.Update(); + + // process m_aPackets + CNetChunk p; + while(m_Net.Recv(&p)) + { + char aAddressStr[NETADDR_MAXSTRSIZE]; + net_addr_str(&p.m_Address, aAddressStr, sizeof(aAddressStr)); + + if(p.m_DataSize >= sizeof(BANMASTER_IPCHECK) && + mem_comp(p.m_pData, BANMASTER_IPCHECK, sizeof(BANMASTER_IPCHECK)) == 0) + { + char *pAddr = (char*)p.m_pData + sizeof(BANMASTER_IPCHECK); + NETADDR CheckAddr; + if(net_addr_from_str(&CheckAddr, pAddr)) + { + dbg_msg("banmaster", "dropped weird message, ip=%s checkaddr='%s'", aAddressStr, pAddr); + } + else + { + CheckAddr.port = 0; + + int Banned = SendResponse(&p.m_Address, &CheckAddr); + + char aBuf[NETADDR_MAXSTRSIZE]; + net_addr_str(&CheckAddr, aBuf, sizeof(aBuf)); + dbg_msg("banmaster", "responded to checkmsg, ip=%s checkaddr=%s result=%s", aAddressStr, aBuf, (Banned) ? "ban" : "ok"); + } + } + } + + if(time_get() - LastUpdate > time_freq() * BAN_REREAD_TIME) + { + ClearBans(); + LastUpdate = time_get(); + m_pConsole->ExecuteFile(BANMASTER_BANFILE); + } + + // be nice to the CPU + thread_sleep(1); + } + + return 0; +} + diff --git a/src/banmaster/banmaster.h b/src/banmaster/banmaster.h new file mode 100644 index 00000000..f7c645f7 --- /dev/null +++ b/src/banmaster/banmaster.h @@ -0,0 +1,12 @@ +/* (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. */ +#ifndef BANMASTER_BANMASTER_H +#define BANMASTER_BANMASTER_H + +static const int BANMASTER_PORT = 8302; + +//static const char BANMASTER_IPOK[] = {255, 255, 255, 255, 'i', 'p', 'o', 'k'}; +static const char BANMASTER_IPBAN[] = {255, 255, 255, 255, 'i', 'p', 'b', 'a'}; +static const char BANMASTER_IPCHECK[] = {255, 255, 255, 255, 'i', 'p', 'c', 'h'}; + +#endif diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index 266b9130..d6bfba8b 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -23,6 +23,8 @@ #include +#include + #include "register.h" #include "server.h" @@ -32,6 +34,8 @@ #include #endif +static const char SERVER_BANMASTERFILE[] = "banmasters.cfg"; + static const char *StrLtrim(const char *pStr) { while(*pStr && *pStr >= 0 && *pStr <= 32) @@ -1022,6 +1026,34 @@ void CServer::PumpNetwork() { SendServerInfo(&Packet.m_Address, ((unsigned char *)Packet.m_pData)[sizeof(SERVERBROWSE_GETINFO)]); } + + /*if(Packet.m_DataSize >= sizeof(BANMASTER_IPOK) && + mem_comp(Packet.m_pData, BANMASTER_IPOK, sizeof(BANMASTER_IPOK)) == 0 && + m_NetServer.BanmasterCheck(&Packet.m_Address) != -1) + { + }*/ + + if(Packet.m_DataSize >= sizeof(BANMASTER_IPBAN) && + mem_comp(Packet.m_pData, BANMASTER_IPBAN, sizeof(BANMASTER_IPBAN)) == 0 && + g_Config.m_SvGlobalBantime && + m_NetServer.BanmasterCheck(&Packet.m_Address) != -1) + { + CUnpacker Up; + char aIp[NETADDR_MAXSTRSIZE]; + char aReason[256]; + NETADDR Addr; + Up.Reset((unsigned char*)Packet.m_pData + sizeof(BANMASTER_IPBAN), Packet.m_DataSize - sizeof(BANMASTER_IPBAN)); + str_copy(aIp, Up.GetString(CUnpacker::SANITIZE_CC|CUnpacker::SKIP_START_WHITESPACES), sizeof(aIp)); + str_copy(aReason, Up.GetString(CUnpacker::SANITIZE_CC|CUnpacker::SKIP_START_WHITESPACES), sizeof(aReason)); + if(net_addr_from_str(&Addr, aIp)) + { + dbg_msg("globalbans", "dropped weird message from banmaster"); + return; + } + + m_NetServer.BanAdd(Addr, g_Config.m_SvGlobalBantime * 60, aReason); + dbg_msg("globalbans", "added ban, ip=%s, reason='%s'", aIp, aReason); + } } } else @@ -1125,7 +1157,7 @@ int CServer::Run() } - if(!m_NetServer.Open(BindAddr, g_Config.m_SvMaxClients, g_Config.m_SvMaxClientsPerIP, 0)) + if(!m_NetServer.Open(BindAddr, g_Config.m_SvMaxClients, g_Config.m_SvMaxClientsPerIP, 0)); { dbg_msg("server", "couldn't open socket. port might already be in use"); return -1; @@ -1133,6 +1165,8 @@ int CServer::Run() m_NetServer.SetCallbacks(NewClientCallback, DelClientCallback, this); + Console()->ExecuteFile(SERVER_BANMASTERFILE); + char aBuf[256]; str_format(aBuf, sizeof(aBuf), "server name is '%s'", g_Config.m_SvName); Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf); @@ -1463,6 +1497,45 @@ void CServer::ConMapReload(IConsole::IResult *pResult, void *pUser) ((CServer *)pUser)->m_MapReload = 1; } +void CServer::ConAddBanmaster(IConsole::IResult *pResult, void *pUser) +{ + CServer *pServer = (CServer *)pUser; + + int Result = pServer->m_NetServer.BanmasterAdd(pResult->GetString(0)); + + if(Result == 0) + pServer->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server/banmaster", "succesfully added banmaster"); + else if (Result == 1) + pServer->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server/banmaster", "invalid address for banmaster / net lookup failed"); + else + pServer->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server/banmaster", "too many banmasters"); +} + +void CServer::ConBanmasters(IConsole::IResult *pResult, void *pUser) +{ + CServer *pServer = (CServer *)pUser; + int NumBanmasters = pServer->m_NetServer.BanmasterNum(); + + char aBuf[128]; + char aIpString[64]; + + for(int i = 0; i < NumBanmasters; i++) + { + NETADDR *pBanmaster = pServer->m_NetServer.BanmasterGet(i); + net_addr_str(pBanmaster, aIpString, sizeof(aIpString)); + str_format(aBuf, sizeof(aBuf), "%d: %s", i, aIpString); + pServer->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server/banmaster", aBuf); + } +} + +void CServer::ConClearBanmasters(IConsole::IResult *pResult, void *pUser) +{ + CServer *pServer = (CServer *)pUser; + + pServer->m_NetServer.BanmastersClear(); + pServer->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server/banmaster", "cleared banmaster list"); +} + void CServer::ConchainSpecialInfoupdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData) { pfnCallback(pResult, pCallbackUserData); @@ -1491,6 +1564,10 @@ void CServer::RegisterCommands() Console()->Register("record", "?s", CFGFLAG_SERVER|CFGFLAG_STORE, ConRecord, this, ""); Console()->Register("stoprecord", "", CFGFLAG_SERVER, ConStopRecord, this, ""); + Console()->Register("add_banmaster", "s", CFGFLAG_SERVER, ConAddBanmaster, this, ""); + Console()->Register("banmasters", "", CFGFLAG_SERVER, ConBanmasters, this, ""); + Console()->Register("clear_banmasters", "", CFGFLAG_SERVER, ConClearBanmasters, this, ""); + Console()->Register("reload", "", CFGFLAG_SERVER, ConMapReload, this, ""); Console()->Chain("sv_name", ConchainSpecialInfoupdate, this); diff --git a/src/engine/server/server.h b/src/engine/server/server.h index 9a68c9fe..ba4dff0b 100644 --- a/src/engine/server/server.h +++ b/src/engine/server/server.h @@ -189,6 +189,9 @@ public: static void ConRecord(IConsole::IResult *pResult, void *pUser); static void ConStopRecord(IConsole::IResult *pResult, void *pUser); static void ConMapReload(IConsole::IResult *pResult, void *pUser); + static void ConAddBanmaster(IConsole::IResult *pResult, void *pUser); + static void ConBanmasters(IConsole::IResult *pResult, void *pUser); + static void ConClearBanmasters(IConsole::IResult *pResult, void *pUser); static void ConchainSpecialInfoupdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData); static void ConchainMaxclientsperipUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData); 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 +#include #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; +} + -- cgit 1.4.1 From fd3ec6f721f7c4a8c610cb1c92a778c992e757e8 Mon Sep 17 00:00:00 2001 From: heinrich5991 Date: Thu, 21 Apr 2011 22:42:47 +0200 Subject: test/dbg --- banmasters.cfg | 4 +++- bans.cfg | 2 ++ src/banmaster/banmaster.cpp | 17 +++++++++-------- src/engine/server/server.cpp | 18 ++++++++++++++---- src/engine/shared/config_variables.h | 2 +- src/engine/shared/network_server.cpp | 6 ++++++ 6 files changed, 35 insertions(+), 14 deletions(-) diff --git a/banmasters.cfg b/banmasters.cfg index 2d943482..891ddbe2 100644 --- a/banmasters.cfg +++ b/banmasters.cfg @@ -1,2 +1,4 @@ clear_banmasters -add_banmaster banmaster.kottnet.net +add_banmaster 127.0.0.1 +add_banmaster 192.168.2.2:8302 +add_banmaster 2342334.1.2.3 diff --git a/bans.cfg b/bans.cfg index a32469c6..17c62828 100644 --- a/bans.cfg +++ b/bans.cfg @@ -1 +1,3 @@ unban_all +ban 127.0.0.2 +bind 127.0.0.1:8302 diff --git a/src/banmaster/banmaster.cpp b/src/banmaster/banmaster.cpp index 8c7014ec..44490c1d 100644 --- a/src/banmaster/banmaster.cpp +++ b/src/banmaster/banmaster.cpp @@ -11,7 +11,7 @@ enum { MAX_BANS=1024, BAN_REREAD_TIME=300, - CFGFLAG_BANMASTER=16 + CFGFLAG_BANMASTER=32 }; static const char BANMASTER_BANFILE[] = "bans.cfg"; @@ -216,16 +216,15 @@ int main(int argc, const char **argv) // ignore_convention m_Net.Update(); // process m_aPackets - CNetChunk p; - while(m_Net.Recv(&p)) + CNetChunk Packet; + while(m_Net.Recv(&Packet)) { char aAddressStr[NETADDR_MAXSTRSIZE]; - net_addr_str(&p.m_Address, aAddressStr, sizeof(aAddressStr)); + net_addr_str(&Packet.m_Address, aAddressStr, sizeof(aAddressStr)); - if(p.m_DataSize >= sizeof(BANMASTER_IPCHECK) && - mem_comp(p.m_pData, BANMASTER_IPCHECK, sizeof(BANMASTER_IPCHECK)) == 0) + if(Packet.m_DataSize >= sizeof(BANMASTER_IPCHECK) && mem_comp(Packet.m_pData, BANMASTER_IPCHECK, sizeof(BANMASTER_IPCHECK)) == 0) { - char *pAddr = (char*)p.m_pData + sizeof(BANMASTER_IPCHECK); + char *pAddr = (char *)Packet.m_pData + sizeof(BANMASTER_IPCHECK); NETADDR CheckAddr; if(net_addr_from_str(&CheckAddr, pAddr)) { @@ -235,13 +234,15 @@ int main(int argc, const char **argv) // ignore_convention { CheckAddr.port = 0; - int Banned = SendResponse(&p.m_Address, &CheckAddr); + int Banned = SendResponse(&Packet.m_Address, &CheckAddr); char aBuf[NETADDR_MAXSTRSIZE]; net_addr_str(&CheckAddr, aBuf, sizeof(aBuf)); dbg_msg("banmaster", "responded to checkmsg, ip=%s checkaddr=%s result=%s", aAddressStr, aBuf, (Banned) ? "ban" : "ok"); } } + else + dbg_msg("banmaster", "dropped weird packet, ip=%s content='%s'", aAddressStr, (char *)Packet.m_pData); } if(time_get() - LastUpdate > time_freq() * BAN_REREAD_TIME) diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index d6bfba8b..b6128822 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -1034,10 +1034,20 @@ void CServer::PumpNetwork() }*/ if(Packet.m_DataSize >= sizeof(BANMASTER_IPBAN) && - mem_comp(Packet.m_pData, BANMASTER_IPBAN, sizeof(BANMASTER_IPBAN)) == 0 && - g_Config.m_SvGlobalBantime && - m_NetServer.BanmasterCheck(&Packet.m_Address) != -1) + mem_comp(Packet.m_pData, BANMASTER_IPBAN, sizeof(BANMASTER_IPBAN)) == 0) { + dbg_msg("dbg", "a"); + + if(!g_Config.m_SvGlobalBantime) + return; + + dbg_msg("dbg", "b"); + + if(m_NetServer.BanmasterCheck(&Packet.m_Address) == -1) + return; + + dbg_msg("dbg", "c"); + CUnpacker Up; char aIp[NETADDR_MAXSTRSIZE]; char aReason[256]; @@ -1157,7 +1167,7 @@ int CServer::Run() } - if(!m_NetServer.Open(BindAddr, g_Config.m_SvMaxClients, g_Config.m_SvMaxClientsPerIP, 0)); + if(!m_NetServer.Open(BindAddr, g_Config.m_SvMaxClients, g_Config.m_SvMaxClientsPerIP, 0)) { dbg_msg("server", "couldn't open socket. port might already be in use"); return -1; diff --git a/src/engine/shared/config_variables.h b/src/engine/shared/config_variables.h index 5d34294d..a540bc8a 100644 --- a/src/engine/shared/config_variables.h +++ b/src/engine/shared/config_variables.h @@ -82,7 +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(SvGlobalBantime, sv_global_bantime, 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_server.cpp b/src/engine/shared/network_server.cpp index 21da1e36..9efd406e 100644 --- a/src/engine/shared/network_server.cpp +++ b/src/engine/shared/network_server.cpp @@ -349,10 +349,12 @@ int CNetServer::Recv(CNetChunk *pChunk) break; } } + dbg_msg("wtf", "."); // client that wants to connect if(!Found) { + dbg_msg("wtf", ","); CNetChunk Packet; char aBuffer[sizeof(BANMASTER_IPCHECK) + NETADDR_MAXSTRSIZE]; mem_copy(aBuffer, BANMASTER_IPCHECK, sizeof(BANMASTER_IPCHECK)); @@ -362,9 +364,13 @@ int CNetServer::Recv(CNetChunk *pChunk) Packet.m_Flags = NETSENDFLAG_CONNLESS; Packet.m_DataSize = str_length(aBuffer) + 1; Packet.m_pData = aBuffer; + dbg_msg("dbg", ","); for(int i = 0; i < m_NumBanmasters; i++) { + char aBufdbg[NETADDR_MAXSTRSIZE]; + net_addr_str(&m_aBanmasters[i], aBufdbg, sizeof(aBufdbg)); + dbg_msg("dbg", "%s", aBufdbg); Packet.m_Address = m_aBanmasters[i]; Send(&Packet); } -- cgit 1.4.1 From f8166ff052b3ef4a3211c7651df33dbc20175218 Mon Sep 17 00:00:00 2001 From: heinrich5991 Date: Fri, 22 Apr 2011 18:33:32 +0200 Subject: removed dbgs from banmaster --- banmasters.cfg | 5 ++--- bans.cfg | 1 - src/banmaster/banmaster.cpp | 2 +- src/engine/server/server.cpp | 8 +------- src/engine/shared/network_server.cpp | 6 ------ 5 files changed, 4 insertions(+), 18 deletions(-) diff --git a/banmasters.cfg b/banmasters.cfg index 891ddbe2..30f3075c 100644 --- a/banmasters.cfg +++ b/banmasters.cfg @@ -1,4 +1,3 @@ clear_banmasters -add_banmaster 127.0.0.1 -add_banmaster 192.168.2.2:8302 -add_banmaster 2342334.1.2.3 +add_banmaster banmaster.kottnet.net + diff --git a/bans.cfg b/bans.cfg index 17c62828..bc3e1d65 100644 --- a/bans.cfg +++ b/bans.cfg @@ -1,3 +1,2 @@ unban_all -ban 127.0.0.2 bind 127.0.0.1:8302 diff --git a/src/banmaster/banmaster.cpp b/src/banmaster/banmaster.cpp index 44490c1d..f68afb0c 100644 --- a/src/banmaster/banmaster.cpp +++ b/src/banmaster/banmaster.cpp @@ -242,7 +242,7 @@ int main(int argc, const char **argv) // ignore_convention } } else - dbg_msg("banmaster", "dropped weird packet, ip=%s content='%s'", aAddressStr, (char *)Packet.m_pData); + dbg_msg("banmaster", "dropped weird packet, ip=%s", aAddressStr, (char *)Packet.m_pData); } if(time_get() - LastUpdate > time_freq() * BAN_REREAD_TIME) diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index b6128822..f7898f26 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -1036,17 +1036,11 @@ void CServer::PumpNetwork() if(Packet.m_DataSize >= sizeof(BANMASTER_IPBAN) && mem_comp(Packet.m_pData, BANMASTER_IPBAN, sizeof(BANMASTER_IPBAN)) == 0) { - dbg_msg("dbg", "a"); - if(!g_Config.m_SvGlobalBantime) return; - - dbg_msg("dbg", "b"); - + if(m_NetServer.BanmasterCheck(&Packet.m_Address) == -1) return; - - dbg_msg("dbg", "c"); CUnpacker Up; char aIp[NETADDR_MAXSTRSIZE]; diff --git a/src/engine/shared/network_server.cpp b/src/engine/shared/network_server.cpp index 9efd406e..21da1e36 100644 --- a/src/engine/shared/network_server.cpp +++ b/src/engine/shared/network_server.cpp @@ -349,12 +349,10 @@ int CNetServer::Recv(CNetChunk *pChunk) break; } } - dbg_msg("wtf", "."); // client that wants to connect if(!Found) { - dbg_msg("wtf", ","); CNetChunk Packet; char aBuffer[sizeof(BANMASTER_IPCHECK) + NETADDR_MAXSTRSIZE]; mem_copy(aBuffer, BANMASTER_IPCHECK, sizeof(BANMASTER_IPCHECK)); @@ -364,13 +362,9 @@ int CNetServer::Recv(CNetChunk *pChunk) Packet.m_Flags = NETSENDFLAG_CONNLESS; Packet.m_DataSize = str_length(aBuffer) + 1; Packet.m_pData = aBuffer; - dbg_msg("dbg", ","); for(int i = 0; i < m_NumBanmasters; i++) { - char aBufdbg[NETADDR_MAXSTRSIZE]; - net_addr_str(&m_aBanmasters[i], aBufdbg, sizeof(aBufdbg)); - dbg_msg("dbg", "%s", aBufdbg); Packet.m_Address = m_aBanmasters[i]; Send(&Packet); } -- cgit 1.4.1 From a42603ba43720b51ba8909d352fc2af88ebba2dd Mon Sep 17 00:00:00 2001 From: heinrich5991 Date: Wed, 2 Nov 2011 21:18:50 +0100 Subject: added banmaster.heinrich5991.de --- banmasters.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/banmasters.cfg b/banmasters.cfg index 30f3075c..78fb069a 100644 --- a/banmasters.cfg +++ b/banmasters.cfg @@ -1,3 +1,4 @@ clear_banmasters add_banmaster banmaster.kottnet.net +add_banmaster banmaster.heinrich5991.de -- cgit 1.4.1