X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fipban.qc;h=a7786f6b660eac467b1d7ea689dfb0f4dac98f92;hb=e12b0503854a3db83f9ddcda6285b6c343c0741a;hp=98dbf5c55b748d5a4d106f8dadec8fc3e29b412f;hpb=65b54b5967f0a152ff308a37196a583e816c1f72;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/ipban.qc b/qcsrc/server/ipban.qc
index 98dbf5c55..a7786f6b6 100644
--- a/qcsrc/server/ipban.qc
+++ b/qcsrc/server/ipban.qc
@@ -31,8 +31,6 @@
 
 #define MAX_IPBAN_URIS (URI_GET_IPBAN_END - URI_GET_IPBAN + 1)
 
-float Ban_Insert(string ip, float bantime, string reason, float dosync);
-
 void OnlineBanList_SendBan(string ip, float bantime, string reason)
 {
 	string uri;
@@ -199,24 +197,29 @@ LABEL(skip)
 
 void OnlineBanList_Think(entity this)
 {
-	float argc;
+	int argc;
 	string uri;
 	float i, n;
 
 	if(autocvar_g_ban_sync_uri == "")
-		goto killme;
+	{
+		delete(this);
+		return;
+	}
 	if(autocvar_g_ban_sync_interval == 0) // < 0 is okay, it means "sync on level start only"
-		goto killme;
+	{
+		delete(this);
+		return;
+	}
 	argc = tokenize_console(autocvar_g_ban_sync_trusted_servers);
 	if(argc == 0)
-		goto killme;
+	{
+		delete(this);
+		return;
+	}
 
-	if(OnlineBanList_Servers)
-		strunzone(OnlineBanList_Servers);
-	OnlineBanList_Servers = argv(0);
-	for(i = 1; i < argc; ++i)
-		OnlineBanList_Servers = strcat(OnlineBanList_Servers, ";", argv(i));
-	OnlineBanList_Servers = strzone(OnlineBanList_Servers);
+	string s = argv(0); for(i = 1; i < argc; ++i) s = strcat(s, ";", argv(i));
+	strcpy(OnlineBanList_Servers, s);
 
 	uri = strcat(     "action=list&hostname=", uri_escape(autocvar_hostname));
 	uri = strcat(uri, "&servers=", uri_escape(OnlineBanList_Servers));
@@ -237,14 +240,13 @@ void OnlineBanList_Think(entity this)
 			uri_get(strcat(argv(i), "?", uri), URI_GET_IPBAN + i); // 1000 = "banlist" callback target
 	}
 
-	if(autocvar_g_ban_sync_interval > 0)
-		this.nextthink = time + max(60, autocvar_g_ban_sync_interval * 60);
-	else
-		goto killme;
-	return;
+	if(autocvar_g_ban_sync_interval <= 0)
+	{
+		delete(this);
+		return;
+	}
 
-LABEL(killme)
-	delete(this);
+	this.nextthink = time + max(60, autocvar_g_ban_sync_interval * 60);
 }
 
 const float BAN_MAX = 256;
@@ -451,9 +453,16 @@ bool Ban_MaybeEnforceBan(entity client)
 {
 	if (Ban_IsClientBanned(client, -1))
 	{
-		string s = sprintf("^1NOTE:^7 banned client %s just tried to enter\n", client.netaddress);
+		if (!client.crypto_idfp)
+			LOG_INFOF("^1NOTE:^7 banned client %s just tried to enter\n",
+				client.netaddress);
+		else
+			LOG_INFOF("^1NOTE:^7 banned client %s (%s) just tried to enter\n",
+				client.netaddress, client.crypto_idfp);
+
+		if(autocvar_g_ban_telluser)
+			sprint(client, "You are banned from this server.\n");
 		dropclient(client);
-		bprint(s);
 		return true;
 	}
 	return false;
@@ -485,7 +494,7 @@ string Ban_Enforce(float j, string reason)
 					reason = strcat(reason, ", ");
 				reason = strcat(reason, it.netname);
 			}
-			s = strcat(s, "^1NOTE:^7 banned client ", it.netaddress, "^7 has to go\n");
+			s = strcat(s, "^1NOTE:^7 banned client ", it.netname, "^7 has to go\n");
 			dropclient(it);
 		}
 	});