diff options
| -rw-r--r-- | banmasters.cfg | 5 | ||||
| -rw-r--r-- | bans.cfg | 1 | ||||
| -rw-r--r-- | src/banmaster/banmaster.cpp | 2 | ||||
| -rw-r--r-- | src/engine/server/server.cpp | 8 | ||||
| -rw-r--r-- | 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); } |