Merge branch 'master' into divVerent/crypto2

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / ipban.qc

diff --git a/qcsrc/server/ipban.qc b/qcsrc/server/ipban.qc
index 9dd3cb51ad08ad1ba7c79e4aaaab79afed593339..1240aea6e977b615fc270d1ab38cd361d6416a9e 100644 (file)
--- a/qcsrc/server/ipban.qc
+++ b/qcsrc/server/ipban.qc
@@ -344,17 +344,25 @@ float Ban_GetClientIP(entity client)
        s = client.netaddress;
 
        i1 = strstrofs(s, ".", 0);
+       if(i1 < 0)
+               i1 = strstrofs(s, ":", 0);
        if(i1 < 0)
                return FALSE;
        i2 = strstrofs(s, ".", i1 + 1);
+       if(i2 < 0)
+               i2 = strstrofs(s, ":", i1 + 1);
        if(i2 < 0)
                return FALSE;
        i3 = strstrofs(s, ".", i2 + 1);
+       if(i3 < 0)
+               i3 = strstrofs(s, ":", i2 + 1);
        if(i3 < 0)
                return FALSE;
        i4 = strstrofs(s, ".", i3 + 1);
+       if(i4 < 0)
+               i4 = strstrofs(s, ":", i3 + 1);
        if(i4 >= 0)
-               return FALSE;
+               s = substring(s, 0, i4);
 
        ban_ip1 = substring(s, 0, i1);
        ban_ip2 = substring(s, 0, i2);