Merge 0.9->0.10

[prosody.git] / net / server_select.lua

diff --git a/net/server_select.lua b/net/server_select.lua
index 537ff44027249492d38b62db12d34e1618f074e9..9c5225c6c1daddf5c7b6355b11c3c9d3cc06da83 100644 (file)
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -51,6 +51,7 @@ local coroutine_yield = coroutine.yield
 local has_luasec, luasec = pcall ( require , "ssl" )
 local luasocket = use "socket" or require "socket"
 local luasocket_gettime = luasocket.gettime
+local getaddrinfo = luasocket.dns.getaddrinfo
 
 --// extern lib methods //--
 
@@ -954,12 +955,19 @@ local addclient = function( address, port, listeners, pattern, sslctx, typ )
                err = "luasec not found"
        end
        if not typ then
-               typ = "tcp"
+               local addrinfo, err = getaddrinfo(address)
+               if not addrinfo then return nil, err end
+               if addrinfo[1] and addrinfo[1].family == "inet6" then
+                       typ = "tcp6"
+               else
+                       typ = "tcp"
+               end
        end
        local create = luasocket[typ]
        if type( create ) ~= "function"  then
                err = "invalid socket type"
        end
+
        if err then
                out_error( "server.lua, addclient: ", err )
                return nil, err