From de8fb21bb5f21b7a32a8d3b82cf087254312ce9c Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 26 Jun 2007 16:21:04 +0000 Subject: [PATCH] ip ban code: minor bugfixes git-svn-id: svn://svn.icculus.org/nexuiz/trunk@2775 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_client.qc | 7 ++++--- data/qcsrc/server/ipban.qc | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index a265b515f..cedaf094d 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -626,15 +626,16 @@ string ColoredTeamName(float t); //void dom_player_join_team(entity pl); void ClientConnect (void) { + local string s; + if(Ban_IsClientBanned(self)) { + s = strcat("^1NOTE:^7 banned client ", self.netaddress, " just tried to enter\n"); dropclient(self); - bprint("^1NOTE:^7 banned client ", self.netaddress, " just tried to enter\n"); + bprint(s); return; } - local string s; - self.classname = "player_joining"; self.flags = self.flags | FL_CLIENT; self.version_nagtime = time + 10 + random() * 10; diff --git a/data/qcsrc/server/ipban.qc b/data/qcsrc/server/ipban.qc index 4833a2a76..c7990616f 100644 --- a/data/qcsrc/server/ipban.qc +++ b/data/qcsrc/server/ipban.qc @@ -85,10 +85,10 @@ float Ban_GetClientIP(entity client) n = tokenizebyseparator(client.netaddress, "."); if(n != 4) return FALSE; - ban_ip1 = strcat1(argv(1)); - ban_ip2 = strcat(ban_ip1, ".", argv(2)); - ban_ip3 = strcat(ban_ip2, ".", argv(3)); - ban_ip4 = strcat(ban_ip3, ".", argv(4)); + ban_ip1 = strcat1(argv(0)); + ban_ip2 = strcat(ban_ip1, ".", argv(1)); + ban_ip3 = strcat(ban_ip2, ".", argv(2)); + ban_ip4 = strcat(ban_ip3, ".", argv(3)); return TRUE; } -- 2.39.2