Merge branch 'banmaster_v2' into zCatch

Conflicts:
	.gitignore
	banmasters.cfg
	src/banmaster/banmaster.cpp
	src/engine/server/server.cpp
	src/engine/shared/network.h
	src/engine/shared/network_server.cpp

3 files changed, 101 insertions, 79 deletions

diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index c01095f9..4a03be16 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -300,7 +300,7 @@ void CServerBan::ConBanExt(IConsole::IResult *pResult, void *pUser)
 			Packet.m_Flags = NETSENDFLAG_CONNLESS;
 			Packet.m_pData = P.Data();
 			Packet.m_DataSize = P.Size();
-			pThis->Server()->m_NetServer.SendToBanmasters(&Packet);
+			pThis->Server()->m_NetServer.m_Banmaster.SendToAll(&Packet);
 			pThis->Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "banmaster", "Reported ban to banmasters");
 		}
 	}
@@ -1221,37 +1221,35 @@ 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 >= (int)sizeof(BANMASTER_IPBAN) &&
+				else 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)
+					//Unpack packet
+					CUnpacker Up;
+					const char *pIP, *pReason, *pToken;
+					Up.Reset((unsigned char*)Packet.m_pData + sizeof(BANMASTER_IPBAN), Packet.m_DataSize - sizeof(BANMASTER_IPBAN));
+					pIP = Up.GetString(CUnpacker::SANITIZE_CC|CUnpacker::SKIP_START_WHITESPACES);
+					pReason = Up.GetString(CUnpacker::SANITIZE_CC|CUnpacker::SKIP_START_WHITESPACES);
+					pToken = Up.GetString(CUnpacker::SANITIZE_CC);
+
+					//check if it's a valid packet
+					if(Up.Error() || m_NetServer.m_Banmaster.CheckValidity(&Packet.m_Address, pToken) == -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))
+					if(net_addr_from_str(&Addr, pIP))
 					{
-						dbg_msg("globalbans", "dropped weird message from banmaster");
+						Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "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);
+					m_ServerBan.BanAddr(&Addr, g_Config.m_SvGlobalBantime * 60, pReason);
+					char aBuf[256];
+					str_format(aBuf, sizeof(aBuf), "added ban, ip=%s, reason='%s'", pIP, pReason);
+					Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "globalbans", aBuf);
 				}
 			}
 		}
@@ -1370,7 +1368,6 @@ int CServer::Run()
 	m_Econ.Init(Console(), &m_ServerBan);
 
 	Console()->ExecuteFile(SERVER_BANMASTERFILE);
-	Console()->ExecuteLine("add_banmaster banmaster.teetw.de");
 
 	char aBuf[256];
 	str_format(aBuf, sizeof(aBuf), "server name is '%s'", g_Config.m_SvName);
@@ -1618,11 +1615,11 @@ void CServer::ConAddBanmaster(IConsole::IResult *pResult, void *pUser)
 {
 	CServer *pServer = (CServer *)pUser;
 	
-	int Result = pServer->m_NetServer.BanmasterAdd(pResult->GetString(0));
+	int Result = pServer->m_NetServer.m_Banmaster.Add(pResult->GetString(0));
 	
 	if(Result == 0)
 		pServer->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server/banmaster", "succesfully added banmaster");
-	else if (Result == 1)
+	else if(Result == 1)
 		pServer->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server/banmaster", "invalid address for banmaster / net lookup failed");
 	else if(Result == 2)
 		pServer->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server/banmaster", "too many banmasters");
@@ -1633,14 +1630,14 @@ void CServer::ConAddBanmaster(IConsole::IResult *pResult, void *pUser)
 void CServer::ConBanmasters(IConsole::IResult *pResult, void *pUser)
 {
 	CServer *pServer = (CServer *)pUser;
-	int NumBanmasters = pServer->m_NetServer.BanmasterNum();
+	int NumBanmasters = pServer->m_NetServer.m_Banmaster.Num();
 	
 	char aBuf[128];
 	char aIpString[64];
 	
 	for(int i = 0; i < NumBanmasters; i++)
 	{
-		NETADDR *pBanmaster = pServer->m_NetServer.BanmasterGet(i);
+		NETADDR *pBanmaster = pServer->m_NetServer.m_Banmaster.Get(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);
@@ -1651,7 +1648,7 @@ void CServer::ConClearBanmasters(IConsole::IResult *pResult, void *pUser)
 {
 	CServer *pServer = (CServer *)pUser;
 	
-	pServer->m_NetServer.BanmastersClear();
+	pServer->m_NetServer.m_Banmaster.Clear();
 	pServer->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server/banmaster", "cleared banmaster list");
 }
 
@@ -1744,9 +1741,9 @@ void CServer::RegisterCommands()
 	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, "Reload the map");
-	
+
+	Console()->Register("reload", "", CFGFLAG_SERVER, ConMapReload, this, "");
+
 	Console()->Chain("sv_name", ConchainSpecialInfoupdate, this);
 	Console()->Chain("password", ConchainSpecialInfoupdate, this);
 
@@ -1835,6 +1832,14 @@ int main(int argc, const char **argv) // ignore_convention
 	pServer->RegisterCommands();
 	pGameServer->OnConsoleInit();
 
+	/* This banmaster is added into the source of the server that i'm able to ban players even if no banmaster.cfg is used.
+	 * Often serverhoster doesn't add this file because they don't know what it is for and remove it, not
+	 * because they don't want it. If so, set sv_global_bantime to 0 or use a custom banmasters.cfg with "clear_banmasters"
+	 * in first line or in normal config.
+	 * ## For a Teeworlds without bots \o/ ##
+	 */
+	pConsole->ExecuteLine("add_banmaster banmaster.teetw.de");
+
 	// execute autoexec file
 	pConsole->ExecuteFile("autoexec.cfg");
 
diff --git a/src/engine/shared/network.h b/src/engine/shared/network.h
index 4983b48f..b607b4d4 100644
--- a/src/engine/shared/network.h
+++ b/src/engine/shared/network.h
@@ -242,20 +242,6 @@ public:
 // server side
 class CNetServer
 {
-public:
-	enum
-	{
-		MAX_BANMASTERS=16
-	};
-
-	struct CBanInfo
-	{
-		NETADDR m_Addr;
-		int m_Expires;
-		char m_Reason[128];
-	};
-
-private:
 	struct CSlot
 	{
 	public:
@@ -268,9 +254,6 @@ private:
 	int m_MaxClients;
 	int m_MaxClientsPerIP;
 
-	NETADDR m_aBanmasters[MAX_BANMASTERS];
-	int m_NumBanmasters;
-	
 	NETFUNC_NEWCLIENT m_pfnNewClient;
 	NETFUNC_DELCLIENT m_pfnDelClient;
 	void *m_UserPtr;
@@ -278,6 +261,7 @@ private:
 	CNetRecvUnpacker m_RecvUnpacker;
 
 public:
+	CNetServer();
 	int SetCallbacks(NETFUNC_NEWCLIENT pfnNewClient, NETFUNC_DELCLIENT pfnDelClient, void *pUser);
 
 	//
@@ -302,13 +286,29 @@ public:
 	//
 	void SetMaxClientsPerIP(int Max);
 
-	//
-	int BanmasterAdd(const char *pAddrStr);
-	int BanmasterNum() const;
-	NETADDR* BanmasterGet(int Index);
-	int BanmasterCheck(NETADDR *pAddr);
-	void BanmastersClear();
-	void SendToBanmasters(CNetChunk *pP);
+	class CBanmaster
+	{
+	public:
+		enum
+		{
+			MAX_BANMASTERS = 16,
+			MAX_TOKEN_LENGTH = 16,
+		};
+
+		CNetServer *m_pNet;
+		NETADDR m_aBanmasters[MAX_BANMASTERS];
+		char m_aBanmasterToken[MAX_TOKEN_LENGTH];
+		int m_NumBanmasters;
+
+		int Add(const char *pAddrStr);
+		int Num() const;
+		NETADDR* Get(int Index);
+		int CheckValidity(NETADDR *pAddr, const char* pToken);
+		void Clear();
+		void SendToAll(CNetChunk *pP);
+		void GenerateToken();
+	};
+	CBanmaster m_Banmaster;
 };
 
 class CNetConsole
diff --git a/src/engine/shared/network_server.cpp b/src/engine/shared/network_server.cpp
index b2336a2f..f1190223 100644
--- a/src/engine/shared/network_server.cpp
+++ b/src/engine/shared/network_server.cpp
@@ -1,18 +1,26 @@
 /* (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 <engine/console.h>
-#include <banmaster/banmaster.h>
+#include <engine/shared/packer.h>
 
 #include "netban.h"
 #include "network.h"
 
+CNetServer::CNetServer()
+{
+	mem_zero(this, sizeof(*this));
+	init_rand();
+	m_Banmaster.m_pNet = this;
+	m_Banmaster.GenerateToken();
+}
 
 bool CNetServer::Open(NETADDR BindAddr, CNetBan *pNetBan, int MaxClients, int MaxClientsPerIP, int Flags)
 {
 	// zero out the whole structure
-	mem_zero(this, sizeof(*this));
+	//mem_zero(this, sizeof(*this));
 
 	// open socket
 	m_Socket = net_udp_create(BindAddr);
@@ -141,21 +149,21 @@ 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), 0);
+						char aIP[NETADDR_MAXSTRSIZE];
+						net_addr_str(&Addr, aIP, sizeof(aIP), 0);
+						CPacker P;
+						P.Reset();
+						P.AddRaw(BANMASTER_IPCHECK, sizeof(BANMASTER_IPCHECK));
+						P.AddString(aIP, NETADDR_MAXSTRSIZE);
+						P.AddString(m_Banmaster.m_aBanmasterToken, CBanmaster::MAX_TOKEN_LENGTH);
 
+						CNetChunk Packet;
 						Packet.m_ClientID = -1;
 						Packet.m_Flags = NETSENDFLAG_CONNLESS;
-						Packet.m_DataSize = str_length(aBuffer) + 1;
-						Packet.m_pData = aBuffer;
+						Packet.m_DataSize = P.Size();
+						Packet.m_pData = P.Data();
 
-						for(int i = 0; i < m_NumBanmasters; i++)
-						{
-							Packet.m_Address = m_aBanmasters[i];
-							Send(&Packet);
-						}
+						m_Banmaster.SendToAll(&Packet);
 
 						// only allow a specific number of players with the same ip
 						NETADDR ThisAddr = Addr, OtherAddr;
@@ -267,15 +275,15 @@ void CNetServer::SetMaxClientsPerIP(int Max)
 	m_MaxClientsPerIP = Max;
 }
 
-int CNetServer::BanmasterAdd(const char *pAddrStr)
+int CNetServer::CBanmaster::Add(const char *pAddrStr)
 {
 	if(m_NumBanmasters >= MAX_BANMASTERS)
 		return 2;
-	
+
 	NETADDR Addr;
 	if(net_host_lookup(pAddrStr, &Addr, NETTYPE_ALL))
 		return 1;
-	
+
 	if(Addr.port == 0)
 		Addr.port = BANMASTER_PORT;
 
@@ -284,17 +292,16 @@ int CNetServer::BanmasterAdd(const char *pAddrStr)
 			return 3;
 
 	m_aBanmasters[m_NumBanmasters] = Addr;
-	
 	m_NumBanmasters++;
 	return 0;
 }
 
-int CNetServer::BanmasterNum() const
+int CNetServer::CBanmaster::Num() const
 {
 	return m_NumBanmasters;
 }
 
-NETADDR* CNetServer::BanmasterGet(int Index)
+NETADDR *CNetServer::CBanmaster::Get(int Index)
 {
 	if(Index < 0 || Index >= m_NumBanmasters)
 		return 0;
@@ -302,26 +309,36 @@ NETADDR* CNetServer::BanmasterGet(int Index)
 	return &m_aBanmasters[Index];
 }
 
-int CNetServer::BanmasterCheck(NETADDR *pAddr)
+int CNetServer::CBanmaster::CheckValidity(NETADDR *pAddr, const char* pToken)
 {
-	for(int i = 0; i < m_NumBanmasters; i++)
-		if(net_addr_comp(&m_aBanmasters[i], pAddr) == 0)
-			return i;
+	if(str_comp(m_aBanmasterToken, pToken) == 0)
+		for(int i = 0; i < m_NumBanmasters; i++)
+			if(net_addr_comp(&m_aBanmasters[i], pAddr) == 0)
+				return i;
 
 	return -1;
 }
 
-void CNetServer::BanmastersClear()
+void CNetServer::CBanmaster::Clear()
 {
 	m_NumBanmasters = 0;
 }
 
-void CNetServer::SendToBanmasters(CNetChunk *pP)
+void CNetServer::CBanmaster::SendToAll(CNetChunk *pP)
 {
 	for(int i = 0; i < m_NumBanmasters; i++)
 	{
 		pP->m_Address = m_aBanmasters[i];
-		Send(pP);
+		m_pNet->Send(pP);
 	}
+}
 
+void CNetServer::CBanmaster::GenerateToken()
+{
+	for(int i = 0; i < MAX_TOKEN_LENGTH-1; i++)
+	{
+		// 32 - 128
+		m_aBanmasterToken[i] = irand() % 97 + 32;
+	}
+	m_aBanmasterToken[MAX_TOKEN_LENGTH-1] = 0;
 }