X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fipban.qc;h=db758a8e6d41bab7300654d865c6bef18b982eb7;hb=5b4d55a39e59f76751555cc0420e5734fbc4a792;hp=a180547c0f97c09cb3632fdeb694e9bece0762a5;hpb=b56d8435ab6710d101761c6c2b9746e38e3cc813;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/ipban.qc b/qcsrc/server/ipban.qc
index a180547c0..db758a8e6 100644
--- a/qcsrc/server/ipban.qc
+++ b/qcsrc/server/ipban.qc
@@ -1,3 +1,14 @@
+#include "ipban.qh"
+#include "_all.qh"
+
+#include "autocvars.qh"
+#include "command/banning.qh"
+#include "defs.qh"
+#include "../common/constants.qh"
+#include "../common/util.qh"
+#include "../dpdefs/dpextensions.qh"
+#include "../dpdefs/progsdefs.qh"
+
 /*
  * Protocol of online ban list:
  *
@@ -138,7 +149,7 @@ void OnlineBanList_URI_Get_Callback(float id, float status, string data)
 	else
 		n = tokenizebyseparator(data, "\n");
 
-	if(mod(n, 4) != 0)
+	if((n % 4) != 0)
 	{
 		print("error: received invalid item count: ", ftos(n), "\n");
 		return;
@@ -238,7 +249,7 @@ void OnlineBanList_Think()
 	remove(self);
 }
 
-#define BAN_MAX 256
+const float BAN_MAX = 256;
 float ban_loaded;
 string ban_ip[BAN_MAX];
 float ban_expire[BAN_MAX];
@@ -276,11 +287,11 @@ void Ban_SaveBans()
 float Ban_Delete(float i)
 {
 	if(i < 0)
-		return FALSE;
+		return false;
 	if(i >= ban_count)
-		return FALSE;
+		return false;
 	if(ban_expire[i] == 0)
-		return FALSE;
+		return false;
 	if(ban_expire[i] > 0)
 	{
 		OnlineBanList_SendUnban(ban_ip[i]);
@@ -289,7 +300,7 @@ float Ban_Delete(float i)
 	ban_expire[i] = 0;
 	ban_ip[i] = "";
 	Ban_SaveBans();
-	return TRUE;
+	return true;
 }
 
 void Ban_LoadBans()
@@ -298,7 +309,7 @@ void Ban_LoadBans()
 	for(i = 0; i < ban_count; ++i)
 		Ban_Delete(i);
 	ban_count = 0;
-	ban_loaded = TRUE;
+	ban_loaded = true;
 	n = tokenize_console(autocvar_g_banned_list);
 	if(stof(argv(0)) == 1)
 	{
@@ -348,7 +359,7 @@ float Ban_GetClientIP(entity client)
 	float i1, i2, i3, i4;
 	string s;
 
-	if(client.crypto_keyfp)
+	if(client.crypto_idfp_signed)
 		ban_idfp = client.crypto_idfp;
 	else
 		ban_idfp = string_null;
@@ -360,10 +371,10 @@ float Ban_GetClientIP(entity client)
 		goto ipv6;
 	i2 = strstrofs(s, ".", i1 + 1);
 	if(i2 < 0)
-		return FALSE;
+		return false;
 	i3 = strstrofs(s, ".", i2 + 1);
 	if(i3 < 0)
-		return FALSE;
+		return false;
 	i4 = strstrofs(s, ".", i3 + 1);
 	if(i4 >= 0)
 		s = substring(s, 0, i4);
@@ -372,21 +383,21 @@ float Ban_GetClientIP(entity client)
 	ban_ip2 = substring(s, 0, i2); // 16
 	ban_ip3 = substring(s, 0, i3); // 24
 	ban_ip4 = strcat1(s); // 32
-	return TRUE;
+	return true;
 
 :ipv6
 	i1 = strstrofs(s, ":", 0);
 	if(i1 < 0)
-		return FALSE;
+		return false;
 	i1 = strstrofs(s, ":", i1 + 1);
 	if(i1 < 0)
-		return FALSE;
+		return false;
 	i2 = strstrofs(s, ":", i1 + 1);
 	if(i2 < 0)
-		return FALSE;
+		return false;
 	i3 = strstrofs(s, ":", i2 + 1);
 	if(i3 < 0)
-		return FALSE;
+		return false;
 
 	ban_ip1 = strcat(substring(s, 0, i1), "::/32"); // 32
 	ban_ip2 = strcat(substring(s, 0, i2), "::/48"); // 48
@@ -397,7 +408,7 @@ float Ban_GetClientIP(entity client)
 	else
 		ban_ip3 = strcat(substring(s, 0, i2), ":0::/56");
 
-	return TRUE;
+	return true;
 }
 
 float Ban_IsClientBanned(entity client, float idx)
@@ -406,7 +417,7 @@ float Ban_IsClientBanned(entity client, float idx)
 	if(!ban_loaded)
 		Ban_LoadBans();
 	if(!Ban_GetClientIP(client))
-		return FALSE;
+		return false;
 	if(idx < 0)
 	{
 		b = 0;
@@ -417,27 +428,27 @@ float Ban_IsClientBanned(entity client, float idx)
 		b = idx;
 		e = idx + 1;
 	}
-	ipbanned = FALSE;
+	ipbanned = false;
 	for(i = b; i < e; ++i)
 	{
 		string s;
 		if(time > ban_expire[i])
 			continue;
 		s = ban_ip[i];
-		if(ban_ip1 == s) ipbanned = TRUE;
-		if(ban_ip2 == s) ipbanned = TRUE;
-		if(ban_ip3 == s) ipbanned = TRUE;
-		if(ban_ip4 == s) ipbanned = TRUE;
-		if(ban_idfp == s) return TRUE;
+		if(ban_ip1 == s) ipbanned = true;
+		if(ban_ip2 == s) ipbanned = true;
+		if(ban_ip3 == s) ipbanned = true;
+		if(ban_ip4 == s) ipbanned = true;
+		if(ban_idfp == s) return true;
 	}
 	if(ipbanned)
 	{
 		if(!autocvar_g_banned_list_idmode)
-			return TRUE;
+			return true;
 		if (!ban_idfp)
-			return TRUE;
+			return true;
 	}
-	return FALSE;
+	return false;
 }
 
 float Ban_MaybeEnforceBan(entity client)
@@ -448,18 +459,18 @@ float Ban_MaybeEnforceBan(entity client)
 		s = strcat("^1NOTE:^7 banned client ", client.netaddress, " just tried to enter\n");
 		dropclient(client);
 		bprint(s);
-		return TRUE;
+		return true;
 	}
-	return FALSE;
+	return false;
 }
 
 .float ban_checked;
 float Ban_MaybeEnforceBanOnce(entity client)
 {
 	if(client.ban_checked)
-		return FALSE;
-	client.ban_checked = TRUE;
-	return Ban_MaybeEnforceBan(self);
+		return false;
+	client.ban_checked = true;
+	return Ban_MaybeEnforceBan(client);
 }
 
 string Ban_Enforce(float i, string reason)
@@ -469,7 +480,8 @@ string Ban_Enforce(float i, string reason)
 
 	// Enforce our new ban
 	s = "";
-	FOR_EACH_REALCLIENT(e)
+	FOR_EACH_CLIENTSLOT(e)
+		if (IS_REAL_CLIENT(e))
 		if(Ban_IsClientBanned(e, i))
 		{
 			if(reason != "")
@@ -516,7 +528,7 @@ float Ban_Insert(string ip, float bantime, string reason, float dosync)
 					if(substring(reason, 0, 1) != "~") // like IRC: unauthenticated banner
 						OnlineBanList_SendBan(ip, bantime, reason);
 
-			return FALSE;
+			return false;
 		}
 
 	// do we have a free slot?
@@ -543,7 +555,7 @@ float Ban_Insert(string ip, float bantime, string reason, float dosync)
 	if(ban_expire[i] > time + bantime)
 	{
 		print(ip, " could not get banned due to no free ban slot\n");
-		return FALSE;
+		return false;
 	}
 	// okay, insert our new victim as i
 	Ban_Delete(i);
@@ -562,7 +574,7 @@ float Ban_Insert(string ip, float bantime, string reason, float dosync)
 			if(substring(reason, 0, 1) != "~") // like IRC: unauthenticated banner
 				OnlineBanList_SendBan(ip, bantime, reason);
 
-	return TRUE;
+	return true;
 }
 
 void Ban_KickBanClient(entity client, float bantime, float masksize, string reason)