aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-05-18 13:14:19 +0200
committerKim Alvefur <zash@zash.se>2013-05-18 13:14:19 +0200
commit300a14d1a5a10de2be469d3afd799ada74a71699 (patch)
tree3df69a5e48a60a2599eb80bedd528ae0ee621257
parentb0859b84602bc5ec95b894149959ef9cc28a9151 (diff)
downloadprosody-300a14d1a5a10de2be469d3afd799ada74a71699.tar.gz
prosody-300a14d1a5a10de2be469d3afd799ada74a71699.zip
util.ip: Convert IPv4 mapped addresses to hex.
-rw-r--r--util/ip.lua7
1 files changed, 7 insertions, 0 deletions
diff --git a/util/ip.lua b/util/ip.lua
index de287b16..856bf034 100644
--- 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