[nexuiz-commits] r6557 - in branches/nexuiz-2.0: . data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-04-22 06:56:05 -0400 (Wed, 22 Apr 2009)
New Revision: 6557

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/server/ipban.qc
   branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
Log:
r6553 | div0 | 2009-04-21 21:11:29 +0200 (Tue, 21 Apr 2009) | 2 lines
ipban: add some debug code
r6555 | div0 | 2009-04-22 12:49:28 +0200 (Wed, 22 Apr 2009) | 2 lines
fix typo in debug message
r6556 | div0 | 2009-04-22 12:53:41 +0200 (Wed, 22 Apr 2009) | 2 lines
add more messages to ipban system


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-04-22 10:53:41 UTC (rev 6556)
+++ branches/nexuiz-2.0/.patchsets	2009-04-22 10:56:05 UTC (rev 6557)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6536,6541-6549,6552-6552
+revisions_applied = 1-6536,6541-6549,6552-6556

Modified: branches/nexuiz-2.0/data/qcsrc/server/ipban.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/ipban.qc	2009-04-22 10:53:41 UTC (rev 6556)
+++ branches/nexuiz-2.0/data/qcsrc/server/ipban.qc	2009-04-22 10:56:05 UTC (rev 6557)
@@ -132,7 +132,7 @@
 		return;
 	}
 
-	print("OK\n");
+	print("OK, ", ftos(n), " items\n");
 
 	for(i = 0; i < n; i += 4)
 	{
@@ -141,6 +141,10 @@
 		reason = argv(i + 2);
 		serverip = argv(i + 3);
 
+		dprint("received ban list item ", ftos(i), ": ip=", ip);
+		dprint(" timeleft=", ftos(timeleft), " reason=", reason);
+		dprint(" serverip=", serverip, "\n");
+
 		timeleft -= 1.5 * cvar("g_ban_sync_timeout");
 		if(timeleft < 0)
 			continue;
@@ -155,7 +159,7 @@
 
 		if(cvar("g_ban_sync_trusted_servers_verify"))
 			if((strstrofs(strcat(";", OnlineBanList_Servers, ";"), strcat(";", serverip, ";"), 0) == -1))
-				goto skip;
+				continue;
 
 		if(syncinterval > 0)
 			timeleft = min(syncinterval + (OnlineBanList_Timeout - time) + 5, timeleft);
@@ -165,7 +169,6 @@
 		print("Ban list syncing: accepted ban of ", ip, " by ", serverip, " at ", uri, ": ");
 		print(reason, "\n");
 
-		continue;
 :skip
 	}
 }
@@ -436,8 +439,12 @@
 	}
 	// if we replace someone, will we be banned longer than him (so long-term
 	// bans never get overridden by short-term bans)
+	if(i < ban_count)
 	if(ban_expire[i] > time + bantime)
+	{
+		print(ip, " could not get banned due to no free ban slot\n");
 		return FALSE;
+	}
 	// okay, insert our new victim as i
 	Ban_Delete(i);
 	print(ip, " has been banned for ", ftos(bantime), " seconds\n");

Modified: branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2009-04-22 10:53:41 UTC (rev 6556)
+++ branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2009-04-22 10:56:05 UTC (rev 6557)
@@ -1845,7 +1845,7 @@
 
 void URI_Get_Callback(float id, float status, string data)
 {
-	dprint("Received HTTP request data for id ", ftos(id), "; status is ", ftos(status), "\nData is\n:");
+	dprint("Received HTTP request data for id ", ftos(id), "; status is ", ftos(status), "\nData is:\n");
 	dprint(data);
 	dprint("\nEnd of data.\n");