r4471 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: esteel
Date: 2008-09-19 07:56:13 -0400 (Fri, 19 Sep 2008)
New Revision: 4471

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/clientcommands.qc
   trunk/data/qcsrc/server/ipban.qc
   trunk/data/qcsrc/server/ipban.qh
Log:
check ip ban in say/teamsay too as to make banned people less annoying (they no longer can say something during the short time from connect till being kicked by the ban system)


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2008-09-19 08:22:07 UTC (rev 4470)
+++ trunk/data/qcsrc/server/cl_client.qc	2008-09-19 11:56:13 UTC (rev 4471)
@@ -1068,13 +1068,8 @@
 		return;
 	}
 
-	if(Ban_IsClientBanned(self))
-	{
-		s = strcat("^1NOTE:^7 banned client ", self.netaddress, " just tried to enter\n");
-		dropclient(self);
-		bprint(s);
+	if(Ban_MaybeEnforceBan(self))
 		return;
-	}
 
 	DecodeLevelParms();
 

Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc	2008-09-19 08:22:07 UTC (rev 4470)
+++ trunk/data/qcsrc/server/clientcommands.qc	2008-09-19 11:56:13 UTC (rev 4471)
@@ -9,6 +9,9 @@
 	float flood;
 	entity head;
 
+	if(Ban_MaybeEnforceBan(source))
+		return;
+
 	if(!teamsay)
 		if(substring(msgin, 0, 1) == " ")
 			msgin = substring(msgin, 1, strlen(msgin) - 1); // work around DP say bug (say_team does not have this!)

Modified: trunk/data/qcsrc/server/ipban.qc
===================================================================
--- trunk/data/qcsrc/server/ipban.qc	2008-09-19 08:22:07 UTC (rev 4470)
+++ trunk/data/qcsrc/server/ipban.qc	2008-09-19 11:56:13 UTC (rev 4471)
@@ -116,6 +116,19 @@
 	return FALSE;
 }
 
+float Ban_MaybeEnforceBan(entity client)
+{
+	if(Ban_IsClientBanned(client))
+	{
+		string s;
+		s = strcat("^1NOTE:^7 banned client ", client.netaddress, " just tried to enter\n");
+		dropclient(client);
+		bprint(s);
+		return TRUE;
+	}
+	return FALSE;
+}
+
 float Ban_Insert(string ip, float bantime)
 {
 	float i;

Modified: trunk/data/qcsrc/server/ipban.qh
===================================================================
--- trunk/data/qcsrc/server/ipban.qh	2008-09-19 08:22:07 UTC (rev 4470)
+++ trunk/data/qcsrc/server/ipban.qh	2008-09-19 11:56:13 UTC (rev 4471)
@@ -1,4 +1,5 @@
 void Ban_SaveBans();
 void Ban_LoadBans();
 float Ban_IsClientBanned(entity client);
+float Ban_MaybeEnforceBan(entity client);
 float GameCommand_Ban(string command);