From 2b6402720494ef8632a2f26970b9cc935dee8d41 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 :
[Backported from 0.10]
---
util/ip.lua | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/util/ip.lua b/util/ip.lua
index 226432cc..043303ee 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