r5226 - in branches/nexuiz-2.0: . data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-12-15 09:53:04 -0500 (Mon, 15 Dec 2008)
New Revision: 5226

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/server/ipban.qc
Log:
r5225 | div0 | 2008-12-15 15:45:55 +0100 (Mon, 15 Dec 2008) | 2 lines
banlist: why -> reason, : -> ;

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-12-15 14:45:55 UTC (rev 5225)
+++ branches/nexuiz-2.0/.patchsets	2008-12-15 14:53:04 UTC (rev 5226)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-5223
+revisions_applied = 1-5225

Modified: branches/nexuiz-2.0/data/qcsrc/server/ipban.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/ipban.qc	2008-12-15 14:45:55 UTC (rev 5225)
+++ branches/nexuiz-2.0/data/qcsrc/server/ipban.qc	2008-12-15 14:53:04 UTC (rev 5226)
@@ -2,12 +2,12 @@
  * Protocol of online ban list:
  *
  * - Reporting a ban:
- *     GET g_ban_sync_uri?action=ban&hostname=...&ip=xxx.xxx.xxx&duration=nnnn&why=...................
+ *     GET g_ban_sync_uri?action=ban&hostname=...&ip=xxx.xxx.xxx&duration=nnnn&reason=...................
  *     (IP 1, 2, 3, or 4 octets, 3 octets for example is a /24 mask)
  * - Removing a ban:
  *     GET g_ban_sync_uri?action=unban&hostname=...&ip=xxx.xxx.xxx
  * - Querying the ban list
- *     GET g_ban_sync_uri?action=list&hostname=...&servers=xxx.xxx.xxx.xxx:xxx.xxx.xxx.xxx:...
+ *     GET g_ban_sync_uri?action=list&hostname=...&servers=xxx.xxx.xxx.xxx;xxx.xxx.xxx.xxx;...
  *     
  *     shows the bans from the listed servers, and possibly others.
  *     Format of a ban is ASCII plain text, four lines per ban, delimited by
@@ -29,7 +29,7 @@
 	uri = strcat(     "?action=ban&hostname=", uri_escape(cvar_string("hostname")));
 	uri = strcat(uri, "&ip=", uri_escape(ip));
 	uri = strcat(uri, "&duration=", ftos(bantime));
-	uri = strcat(uri, "&why=", uri_escape(reason));
+	uri = strcat(uri, "&reason=", uri_escape(reason));
 
 	n = tokenize_sane(cvar_string("g_ban_sync_uri"));
 	for(i = 0; i < n; ++i)
@@ -120,7 +120,7 @@
 				goto skip;
 			}
 
-		if(strstrofs(strcat(":", OnlineBanList_Servers, ":"), strcat(":", serverip, ":"), 0) != -1)
+		if(strstrofs(strcat(";", OnlineBanList_Servers, ";"), strcat(";", serverip, ";"), 0) != -1)
 		{
 			if(syncinterval > 0)
 				timeleft = min(syncinterval + 15, timeleft);
@@ -155,7 +155,7 @@
 			strunzone(OnlineBanList_Servers);
 		OnlineBanList_Servers = argv(0);
 		for(i = 1; i < argc; ++i)
-			OnlineBanList_Servers = strcat(OnlineBanList_Servers, ":", argv(i));
+			OnlineBanList_Servers = strcat(OnlineBanList_Servers, ";", argv(i));
 		OnlineBanList_Servers = strzone(OnlineBanList_Servers);
 		
 		uri = strcat(     "?action=list&hostname=", uri_escape(cvar_string("hostname")));