mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.ip: Automatically determine protocol of IP address if none specified. Return error if invalid. [Backported from 0.10]

Browse source
This commit is contained in:
Matthew Wild 2013-05-17 14:52:52 +01:00
parent 8178f7bd88
commit 2ab42c8dbf
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
util/ip.lua
View file

@ -12,7 +12,15 @@ local ip_mt = { __index = function (ip, key) return (ip_methods[key])(ip); end,
local hex2bits = { ["0"] = "0000", ["1"] = "0001", ["2"] = "0010", ["3"] = "0011", ["4"] = "0100", ["5"] = "0101", ["6"] = "0110", ["7"] = "0111", ["8"] = "1000", ["9"] = "1001", ["A"] = "1010", ["B"] = "1011", ["C"] = "1100", ["D"] = "1101", ["E"] = "1110", ["F"] = "1111" };
local function new_ip(ipStr, proto)
if proto ~= "IPv4" and proto ~= "IPv6" then
if not proto then
local sep = ipStr:match("^%x+(.)");
if sep == ":" then proto = "IPv6"
elseif sep == "." then proto = "IPv4"
end
if not proto then
return nil, "invalid address";
end
elseif proto ~= "IPv4" and proto ~= "IPv6" then
return nil, "invalid protocol";
end
if proto == "IPv6" and ipStr:find('.', 1, true) then