mod_bosh: pcall() core_process_stanza per stanza, to bring in line with other listene...

[prosody.git] / util / ip.lua

diff --git a/util/ip.lua b/util/ip.lua
index de287b163b90a1b48e827a57f18680954608b0b8..856bf03498261860db5796afccac66258c33beae 100644 (file)
--- a/util/ip.lua
+++ b/util/ip.lua
@@ -15,6 +15,13 @@ local function new_ip(ipStr, proto)
        if proto ~= "IPv4" and proto ~= "IPv6" then
                return nil, "invalid protocol";
        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)
+                       return (":%04X:%04X"):format(a*256+b,c*256+d);
+               end);
+               if changed ~= 1 then return nil, "invalid-address"; end
+       end
 
        return setmetatable({ addr = ipStr, proto = proto }, ip_mt);
 end