diff options
author | Kim Alvefur <zash@zash.se> | 2013-05-18 13:14:19 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-05-18 13:14:19 +0200 |
commit | 146ed08e62ea1fe04dadaf57a8541ad0dd58f2c9 (patch) | |
tree | 3df69a5e48a60a2599eb80bedd528ae0ee621257 | |
parent | bb7c05bbf4a558cb909c96ca216c3c7735840763 (diff) | |
download | prosody-146ed08e62ea1fe04dadaf57a8541ad0dd58f2c9.tar.gz prosody-146ed08e62ea1fe04dadaf57a8541ad0dd58f2c9.zip |
util.ip: Convert IPv4 mapped addresses to hex.
-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 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 |