From 4d630bbd3cb0478ca5b90f0d27d6b801751c4472 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 17 May 2013 14:52:52 +0100
Subject: util.ip: Automatically determine protocol of IP address if none
 specified. Return error if invalid.

---
 util/ip.lua | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'util/ip.lua')

diff --git a/util/ip.lua b/util/ip.lua
index de287b16..9e668d1b 100644
--- a/util/ip.lua
+++ b/util/ip.lua
@@ -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
 
-- 
cgit v1.2.3


From e082db3cf78c91b937a996cae2c71511df616e84 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 17 May 2013 14:53:51 +0100
Subject: util.ip: Add 'private' method/property to determine whether an IP
 address is generally expected to be internet-routeable (YMMV)

---
 util/ip.lua | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'util/ip.lua')

diff --git a/util/ip.lua b/util/ip.lua
index 9e668d1b..6ebc023b 100644
--- a/util/ip.lua
+++ b/util/ip.lua
@@ -193,5 +193,20 @@ function ip_methods:scope()
 	return value;
 end
 
+function ip_methods:private()
+	local private = self.scope ~= 0xE;
+	if not private and self.proto == "IPv4" then
+		local ip = self.addr;
+		local fields = {};
+		ip:gsub("([^.]*).?", function (c) fields[#fields + 1] = tonumber(c) end);
+		if fields[1] == 127 or fields[1] == 10 or (fields[1] == 192 and fields[2] == 168)
+		or (fields[1] == 172 and (fields[2] >= 16 or fields[2] <= 32)) then
+			private = true;
+		end
+	end
+	self.private = private;
+	return private;
+end
+
 return {new_ip = new_ip,
 	commonPrefixLength = commonPrefixLength};
-- 
cgit v1.2.3


From 62a1d8a2d312c61673f868878efdcb747c63f772 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 18 May 2013 16:45:29 +0100
Subject: util.ip: Add CIDR notation parsing and matching

---
 util/ip.lua | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'util/ip.lua')

diff --git a/util/ip.lua b/util/ip.lua
index 20ea3dd7..8cf0076e 100644
--- a/util/ip.lua
+++ b/util/ip.lua
@@ -215,5 +215,28 @@ function ip_methods:private()
 	return private;
 end
 
+local function parse_cidr(cidr)
+	local bits;
+	local ip_len = cidr:find("/", 1, true);
+	if ip_len then
+		bits = tonumber(cidr:sub(ip_len+1, -1));
+		cidr = cidr:sub(1, ip_len-1);
+	end
+	return new_ip(cidr), bits;
+end
+
+local function match(ipA, ipB, bits)
+	local common_bits = commonPrefixLength(ipA, ipB);
+	if not bits then
+		return ipA == ipB;
+	end
+	if bits and ipB.proto == "IPv4" then
+		common_bits = common_bits - 96; -- v6 mapped addresses always share these bits
+	end
+	return common_bits >= bits;
+end
+
 return {new_ip = new_ip,
-	commonPrefixLength = commonPrefixLength};
+	commonPrefixLength = commonPrefixLength,
+	parse_cidr = parse_cidr,
+	match=match};
-- 
cgit v1.2.3


From 97cef2740ba76cc8fb2c0f33983f02dc1d5d4fc5 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 18 May 2013 21:41:17 +0100
Subject: util.ip: Fix protocol detection of IPv6 addresses beginning with :

---
 util/ip.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'util/ip.lua')

diff --git a/util/ip.lua b/util/ip.lua
index 8cf0076e..62649c9b 100644
--- a/util/ip.lua
+++ b/util/ip.lua
@@ -14,8 +14,10 @@ local hex2bits = { ["0"] = "0000", ["1"] = "0001", ["2"] = "0010", ["3"] = "0011
 local function new_ip(ipStr, proto)
 	if not proto then
 		local sep = ipStr:match("^%x+(.)");
-		if sep == ":" then proto = "IPv6"
-		elseif sep == "." then proto = "IPv4"
+		if sep == ":" or (not(sep) and ipStr:sub(1,1) == ":") then
+			proto = "IPv6"
+		elseif sep == "." then
+			proto = "IPv4"
 		end
 		if not proto then
 			return nil, "invalid address";
-- 
cgit v1.2.3