From 73fb071e0572c827e13b7b4692a01c5d4b2bd28c Mon Sep 17 00:00:00 2001 From: div0 Date: Wed, 22 Apr 2009 10:56:05 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@6557 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- .patchsets | 2 +- data/qcsrc/server/ipban.qc | 13 ++++++++++--- data/qcsrc/server/miscfunctions.qc | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.patchsets b/.patchsets index 178ca2ec2..1050e2832 100644 --- a/.patchsets +++ b/.patchsets @@ -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 diff --git a/data/qcsrc/server/ipban.qc b/data/qcsrc/server/ipban.qc index 07a082381..84875db1c 100644 --- a/data/qcsrc/server/ipban.qc +++ b/data/qcsrc/server/ipban.qc @@ -132,7 +132,7 @@ void OnlineBanList_URI_Get_Callback(float id, float status, string data) return; } - print("OK\n"); + print("OK, ", ftos(n), " items\n"); for(i = 0; i < n; i += 4) { @@ -141,6 +141,10 @@ void OnlineBanList_URI_Get_Callback(float id, float status, string data) 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 @@ void OnlineBanList_URI_Get_Callback(float id, float status, string data) 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 @@ void OnlineBanList_URI_Get_Callback(float id, float status, string data) print("Ban list syncing: accepted ban of ", ip, " by ", serverip, " at ", uri, ": "); print(reason, "\n"); - continue; :skip } } @@ -436,8 +439,12 @@ float Ban_Insert(string ip, float bantime, string reason, float dosync) } // 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"); diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index 81b30ae47..c5846f750 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -1845,7 +1845,7 @@ float URI_GET_IPBAN_END = 16; 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"); -- 2.39.2