From: Rudolf Polzer Date: Thu, 7 Oct 2010 13:40:03 +0000 (+0200) Subject: Merge branch 'master' into divVerent/crypto2 X-Git-Tag: xonotic-v0.1.0preview~308 X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=e16769afc48942cb2e9323f0e86b090959bf36b7;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into divVerent/crypto2 Conflicts: qcsrc/server/ipban.qc --- e16769afc48942cb2e9323f0e86b090959bf36b7 diff --cc defaultXonotic.cfg index 555da4afa,e00da3208..7312a34e4 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@@ -1255,9 -1260,8 +1260,9 @@@ set g_keyhunt_teams set cl_gravity 800 "but ignored anyway" set g_ban_default_bantime 5400 "90 minutes" - set g_ban_default_masksize 3 "whole 255.255.255.0 networks (set to 4 for single IPs); when UID support is compiled in, masksize 0 means banning by UID" + set g_ban_default_masksize 3 "masksize 0 means banning by UID only, 1 means banning by /8 (IPv6: /32) network, 2 means banning by /16 (IPv6: /48) network, 3 means banning by /24 (IPv6: /56) network, 4 means banning by single IP (IPv6: /64 network)" set g_banned_list "" "format: IP remainingtime IP remainingtime ..." +set g_banned_list_idmode "1" "when set, the IP banning system always uses the ID over the IP address (so a user in a banned IP range can connect if they have a valid signed ID)" alias bans "sv_cmd bans" alias ban "sv_cmd ban $*" // usage: ban address(maybe incomplete, like 1.2.3) bantime(seconds) alias kickban "sv_cmd kickban $*" // usage: kickban # playerno bantime(seconds) masksize(bytes)