Merge remote-tracking branch 'heinrich5991/banmaster' into banmaster_v2

Conflicts:
	src/engine/server/server.cpp
	src/engine/server/server.h
	src/engine/shared/config_variables.h
	src/engine/shared/network.h
	src/engine/shared/network_server.cpp

2 files changed, 87 insertions, 1 deletions

diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index a231d1e8..2cb33f36 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -27,6 +27,8 @@
 
 #include <mastersrv/mastersrv.h>
 
+#include <banmaster/banmaster.h>
+
 #include "register.h"
 #include "server.h"
 
@@ -36,6 +38,8 @@
 	#include <windows.h>
 #endif
 
+static const char SERVER_BANMASTERFILE[] = "banmasters.cfg";
+
 static const char *StrUTF8Ltrim(const char *pStr)
 {
 	while(*pStr)
@@ -1178,6 +1182,38 @@ 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)
+				{
+					if(!g_Config.m_SvGlobalBantime)
+						return;
+
+					if(m_NetServer.BanmasterCheck(&Packet.m_Address) == -1)
+						return;
+
+					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_ServerBan.BanAddr(&Addr, g_Config.m_SvGlobalBantime * 60, aReason);
+					dbg_msg("globalbans", "added ban, ip=%s, reason='%s'", aIp, aReason);
+				}
 			}
 		}
 		else
@@ -1294,6 +1330,8 @@ int CServer::Run()
 	m_ServerBan.Init(Console(), Storage(), this);
 	m_Econ.Init(Console(), &m_ServerBan);
 
+	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);
@@ -1531,6 +1569,46 @@ 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), 0);
+		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::ConLogout(IConsole::IResult *pResult, void *pUser)
 {
 	CServer *pServer = (CServer *)pUser;
@@ -1617,7 +1695,11 @@ void CServer::RegisterCommands()
 	Console()->Register("record", "?s", CFGFLAG_SERVER|CFGFLAG_STORE, ConRecord, this, "Record to a file");
 	Console()->Register("stoprecord", "", CFGFLAG_SERVER, ConStopRecord, this, "Stop recording");
 
-	Console()->Register("reload", "", CFGFLAG_SERVER, ConMapReload, this, "Reload the map");
+	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);
 	Console()->Chain("password", ConchainSpecialInfoupdate, this);
diff --git a/src/engine/server/server.h b/src/engine/server/server.h
index 696b472d..731ab1b9 100644
--- a/src/engine/server/server.h
+++ b/src/engine/server/server.h
@@ -230,6 +230,10 @@ public:
 	static void ConchainModCommandUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	static void ConchainConsoleOutputLevelUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 
+	static void ConAddBanmaster(IConsole::IResult *pResult, void *pUser);
+	static void ConBanmasters(IConsole::IResult *pResult, void *pUser);
+	static void ConClearBanmasters(IConsole::IResult *pResult, void *pUser);
+
 	void RegisterCommands();