some changes...

2 files changed, 59 insertions, 36 deletions

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;
 }