From f57e2f727b11185ee19f854f378a51c6efa114d7 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 18 May 2013 13:14:19 +0200
Subject: util.ip: Convert IPv4 mapped addresses to hex.

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

(limited to 'util')

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
-- 
cgit v1.2.3