diff options
| author | Kim Alvefur <zash@zash.se> | 2013-05-18 13:20:46 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-05-18 13:20:46 +0200 |
| commit | 7681e34f83898993205274a416718dc3db56333d (patch) | |
| tree | 0f2cb51dea138f8394524c68f5cfb3f876c3e20b /util | |
| parent | 67ee4ff9ad713a73d865c62e4d92aa80dcc40587 (diff) | |
| parent | 635e63f81411ccf4474a7e74561e027bd023dd19 (diff) | |
| download | prosody-7681e34f83898993205274a416718dc3db56333d.tar.gz prosody-7681e34f83898993205274a416718dc3db56333d.zip | |
Merge 0.9->trunk
Diffstat (limited to 'util')
| -rw-r--r-- | util/ip.lua | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/util/ip.lua b/util/ip.lua index 6ebc023b..20ea3dd7 100644 --- a/util/ip.lua +++ b/util/ip.lua @@ -23,6 +23,13 @@ local function new_ip(ipStr, proto) elseif 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 |