diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-05-18 21:41:17 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-05-18 21:41:17 +0100 |
| commit | 63b5f5553703fde25387fe002054fa8658ae24fc (patch) | |
| tree | 5e1245718c80ef5fde333a5a458375524da90d36 | |
| parent | 88d3ddd8e0bbe3b8d6d7ee83661c844cef993560 (diff) | |
| download | prosody-63b5f5553703fde25387fe002054fa8658ae24fc.tar.gz prosody-63b5f5553703fde25387fe002054fa8658ae24fc.zip | |
util.ip: Fix protocol detection of IPv6 addresses beginning with : [Backported from 0.10]
| -rw-r--r-- | util/ip.lua | 6 |
1 files 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"; |