aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-04 17:47:40 +0100
committerKim Alvefur <zash@zash.se>2016-01-04 17:47:40 +0100
commit18b1fee80d489898157a696ab8b624b68bf57509 (patch)
treeda70d51c4f2940b127d7eb1d1f7ac5c5ef38d4bb
parent133dda92a83960bee1a8c8018e1bb0ea1a5ebe87 (diff)
downloadprosody-18b1fee80d489898157a696ab8b624b68bf57509.tar.gz
prosody-18b1fee80d489898157a696ab8b624b68bf57509.zip
util.ip: Support zone id syntax in IPv6 addresses
-rw-r--r--util/ip.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/util/ip.lua b/util/ip.lua
index 043303ee..acfd7f24 100644
--- 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)