some changes...

7 files changed, 106 insertions, 78 deletions

diff --git a/src/banmaster/banmaster.cpp b/src/banmaster/banmaster.cpp
index 97eb2aee..a8a5ad02 100644
--- a/src/banmaster/banmaster.cpp
+++ b/src/banmaster/banmaster.cpp
@@ -97,15 +97,9 @@ void CleanUp()
 	delete m_pStorage;
 }
 
-int SendResponse(NETADDR *pAddr, NETADDR *pCheck)
+int SendResponse(NETADDR *pAddr, NETADDR *pCheck, const char *pToken)
 {
-	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;
+	CNetChunk p;
 
 	p.m_ClientID = -1;
 	p.m_Address = *pAddr;
@@ -116,13 +110,20 @@ int SendResponse(NETADDR *pAddr, NETADDR *pCheck)
 
 	if(m_NetBan.GetBanInfo(pCheck, aReason, sizeof(aReason), &Expires))
 	{
-		net_addr_str(pCheck, pIpBanContent, NETADDR_MAXSTRSIZE, false);
-		char *pIpBanReason = pIpBanContent + (str_length(pIpBanContent) + 1);
-		str_copy(pIpBanReason, aReason, 256);
+		char aCheckAddr[NETADDR_MAXSTRSIZE];
+		net_addr_str(pCheck, aCheckAddr, NETADDR_MAXSTRSIZE, false);
+
+		CPacker P;
+		P.Reset();
+		P.AddRaw(BANMASTER_IPBAN, sizeof(BANMASTER_IPBAN));
+		P.AddString(aCheckAddr, -1);
+		P.AddString(aReason, -1);
+		P.AddString(pToken, -1);
 		
-		p.m_pData = aIpBan;
-		p.m_DataSize = sizeof(BANMASTER_IPBAN) + str_length(pIpBanContent) + 1 + str_length(pIpBanReason) + 1;
-		m_Net.Send(&p);
+		p.m_pData = P.Data();
+		p.m_DataSize = P.Size();
+		if(!P.Error())
+			m_Net.Send(&p);
 		return 1;
 	}
 
@@ -141,7 +142,7 @@ void AddRecvBan(NETADDR *pFromAddr, unsigned char *pData, int Size)
 	pReason = Up.GetString(CUnpacker::SANITIZE_CC|CUnpacker::SKIP_START_WHITESPACES);
 
 	NETADDR ReportAddr;
-	if(net_addr_from_str(&ReportAddr, pIP) == 0 && pName[0] && pReason[0])
+	if(!Up.Error() && net_addr_from_str(&ReportAddr, pIP) == 0 && pName[0] && pReason[0])
 	{
 		for(int i = MAX_BAN_ENTRIES-1; i > 0; i--)
 			mem_copy(&m_RecvBans[i], &m_RecvBans[i-1], sizeof(m_RecvBans[i]));
@@ -287,9 +288,13 @@ int main(int argc, const char **argv) // ignore_convention
 
 			if(Packet.m_DataSize >= (int)sizeof(BANMASTER_IPCHECK) && mem_comp(Packet.m_pData, BANMASTER_IPCHECK, sizeof(BANMASTER_IPCHECK)) == 0)
 			{
-				char *pAddr = (char *)Packet.m_pData + sizeof(BANMASTER_IPCHECK);
+				CUnpacker Up;
+				Up.Reset((unsigned char*) Packet.m_pData + sizeof(BANMASTER_IPCHECK), Packet.m_DataSize - sizeof(BANMASTER_IPCHECK));
+				const char *pAddr = Up.GetString(CUnpacker::SANITIZE_CC|CUnpacker::SKIP_START_WHITESPACES);
+				const char *pToken = Up.GetString(CUnpacker::SANITIZE_CC);
+
 				NETADDR CheckAddr;
-				if(net_addr_from_str(&CheckAddr, pAddr))
+				if(net_addr_from_str(&CheckAddr, pAddr) || Up.Error())
 				{
 					char aBuf[128];
 					str_format(aBuf, sizeof(aBuf), "dropped weird message, ip='%s' checkaddr='%s'", aAddressStr, pAddr);
@@ -299,7 +304,7 @@ int main(int argc, const char **argv) // ignore_convention
 				{
 					CheckAddr.port = 0;
 
-					int Banned = SendResponse(&Packet.m_Address, &CheckAddr);
+					int Banned = SendResponse(&Packet.m_Address, &CheckAddr, pToken);
 
 					char aIP[NETADDR_MAXSTRSIZE];
 					char aBuf[256];
diff --git a/src/banmaster/banmaster.h b/src/banmaster/banmaster.h
index 296dc14d..fb89e3c0 100644
--- a/src/banmaster/banmaster.h
+++ b/src/banmaster/banmaster.h
@@ -5,7 +5,6 @@
 
 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'};
 static const char BANMASTER_IPREPORT[] = {255, 255, 255, 255, 'i', 'p', 'r', 'e'};
diff --git a/src/base/system.c b/src/base/system.c
index ed0f41ec..99fd0380 100644
--- a/src/base/system.c
+++ b/src/base/system.c
@@ -1820,6 +1820,8 @@ char str_uppercase(char c)
 int str_toint(const char *str) { return atoi(str); }
 float str_tofloat(const char *str) { return atof(str); }
 
+void init_rand() { srand(time(NULL)); }
+int irand() { return rand(); }
 
 
 static int str_utf8_isstart(char c)
diff --git a/src/base/system.h b/src/base/system.h
index b3588dbf..bc4ee734 100644
--- a/src/base/system.h
+++ b/src/base/system.h
@@ -1194,6 +1194,9 @@ int str_isspace(char c);
 char str_uppercase(char c);
 unsigned str_quickhash(const char *str);
 
+void init_rand();
+int irand();
+
 /*
 	Function: gui_messagebox
 		Display plain OS-dependent message box
diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index cd73c5a7..3a652d68 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,38 +1221,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) &&
+				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))
 					{
 						Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "globalbans", "dropped weird message from banmaster");
 						return;
 					}
 
-					m_ServerBan.BanAddr(&Addr, g_Config.m_SvGlobalBantime * 60, 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'", aIp, aReason);
+					str_format(aBuf, sizeof(aBuf), "added ban, ip=%s, reason='%s'", pIP, pReason);
 					Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "globalbans", aBuf);
 				}
 			}
@@ -1615,7 +1611,7 @@ 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");
@@ -1630,14 +1626,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);
@@ -1648,7 +1644,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");
 }
 
diff --git a/src/engine/shared/network.h b/src/engine/shared/network.h
index ea5ed98f..d4418097 100644
--- a/src/engine/shared/network.h
+++ b/src/engine/shared/network.h
@@ -243,11 +243,6 @@ public:
 class CNetServer
 {
 public:
-	enum
-	{
-		MAX_BANMASTERS=16
-	};
-
 	struct CSlot
 	{
 	public:
@@ -260,9 +255,6 @@ public:
 	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;
@@ -295,13 +287,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 98b88ac5..6818c0f0 100644
--- a/src/engine/shared/network_server.cpp
+++ b/src/engine/shared/network_server.cpp
@@ -4,6 +4,7 @@
 #include <banmaster/banmaster.h>
 
 #include <engine/console.h>
+#include <engine/shared/packer.h>
 
 #include "netban.h"
 #include "network.h"
@@ -11,6 +12,9 @@
 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)
@@ -145,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;
@@ -271,7 +275,7 @@ 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;
@@ -293,12 +297,12 @@ int CNetServer::BanmasterAdd(const char *pAddrStr)
 	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;
@@ -306,25 +310,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;
 }