Extended banmaster, now its easier and more comfortable to ban"

1 files changed, 26 insertions, 7 deletions

diff --git a/src/engine/shared/network_server.cpp b/src/engine/shared/network_server.cpp
index 32525802..98b88ac5 100644
--- a/src/engine/shared/network_server.cpp
+++ b/src/engine/shared/network_server.cpp
@@ -8,11 +8,15 @@
 #include "netban.h"
 #include "network.h"
 
+CNetServer::CNetServer()
+{
+	mem_zero(this, sizeof(*this));
+}
 
 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);
@@ -271,13 +275,20 @@ int CNetServer::BanmasterAdd(const char *pAddrStr)
 {
 	if(m_NumBanmasters >= MAX_BANMASTERS)
 		return 2;
-	
-	if(net_host_lookup(pAddrStr, &m_aBanmasters[m_NumBanmasters], NETTYPE_IPV4))
+
+	NETADDR Addr;
+	if(net_host_lookup(pAddrStr, &Addr, NETTYPE_ALL))
 		return 1;
-	
-	if(m_aBanmasters[m_NumBanmasters].port == 0)
-		m_aBanmasters[m_NumBanmasters].port = BANMASTER_PORT;
-	
+
+	if(Addr.port == 0)
+		Addr.port = BANMASTER_PORT;
+
+	for(int i = 0; i < m_NumBanmasters; i++)
+		if(mem_comp(&Addr, &m_aBanmasters[i], sizeof(NETADDR)) == 0)
+			return 3;
+
+	m_aBanmasters[m_NumBanmasters] = Addr;
+
 	m_NumBanmasters++;
 	return 0;
 }
@@ -309,3 +320,11 @@ void CNetServer::BanmastersClear()
 	m_NumBanmasters = 0;
 }
 
+void CNetServer::SendToBanmasters(CNetChunk *pP)
+{
+	for(int i = 0; i < m_NumBanmasters; i++)
+	{
+		pP->m_Address = m_aBanmasters[i];
+		Send(pP);
+	}
+}