util.dataforms: Fix including default value for list-single when given as field.value...

[prosody.git] / util / ip.lua

diff --git a/util/ip.lua b/util/ip.lua
index d0ae07eb8aa3c57cd18e178b20ff10c391d0ed4b..ec3b4d7e56ba4c8342d11e5af00a044d25fe418e 100644 (file)
--- a/util/ip.lua
+++ b/util/ip.lua
@@ -25,6 +25,10 @@ local function new_ip(ipStr, proto)
        elseif proto ~= "IPv4" and proto ~= "IPv6" then
                return nil, "invalid protocol";
        end
+       local zone;
+       if proto == "IPv6" and ipStr:find('%', 1, true) then
+               ipStr, zone = ipStr:match("^(.-)%%(.*)");
+       end
        if proto == "IPv6" and ipStr:find('.', 1, true) then
                local changed;
                ipStr, changed = ipStr:gsub(":(%d+)%.(%d+)%.(%d+)%.(%d+)$", function(a,b,c,d)
@@ -33,7 +37,7 @@ local function new_ip(ipStr, proto)
                if changed ~= 1 then return nil, "invalid-address"; end
        end
 
-       return setmetatable({ addr = ipStr, proto = proto }, ip_mt);
+       return setmetatable({ addr = ipStr, proto = proto, zone = zone }, ip_mt);
 end
 
 local function toBits(ip)
@@ -229,13 +233,10 @@ end
 
 local function match(ipA, ipB, bits)
        local common_bits = commonPrefixLength(ipA, ipB);
-       if not bits then
-               return ipA == ipB;
-       end
        if bits and ipB.proto == "IPv4" then
                common_bits = common_bits - 96; -- v6 mapped addresses always share these bits
        end
-       return common_bits >= bits;
+       return common_bits >= (bits or 128);
 end
 
 return {new_ip = new_ip,