aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-05-18 21:41:17 +0100
committerMatthew Wild <mwild1@gmail.com>2013-05-18 21:41:17 +0100
commit97cef2740ba76cc8fb2c0f33983f02dc1d5d4fc5 (patch)
treea1804c4501b5d3240c0d523a89839f392c48db4a
parent7f6333bd83cec64412862e4c49dce81e9873fa96 (diff)
downloadprosody-97cef2740ba76cc8fb2c0f33983f02dc1d5d4fc5.tar.gz
prosody-97cef2740ba76cc8fb2c0f33983f02dc1d5d4fc5.zip
util.ip: Fix protocol detection of IPv6 addresses beginning with :
-rw-r--r--util/ip.lua6
1 files changed, 4 insertions, 2 deletions
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";