diff options
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/server/server.cpp | 18 | ||||
| -rw-r--r-- | src/engine/shared/config_variables.h | 2 | ||||
| -rw-r--r-- | src/engine/shared/network_server.cpp | 6 |
3 files changed, 21 insertions, 5 deletions
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); } |