Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util.ip: Automatically determine protocol of IP address if none specified. Return error if invalid. [Backported from 0.10]
authorMatthew Wild <mwild1@gmail.com>
Fri, 17 May 2013 14:52:52 +0100
changeset 7055 306aabf2d57d
parent 7054 ecfa474ff570
child 7056 3049137d14b6
util.ip: Automatically determine protocol of IP address if none specified. Return error if invalid. [Backported from 0.10]
util/ip.lua file | annotate | diff | comparison | revisions 
--- a/util/ip.lua	Wed Jan 06 00:24:06 2016 +0000
+++ b/util/ip.lua	Fri May 17 14:52:52 2013 +0100
@@ -12,7 +12,15 @@
 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
prosody