Numerous BOSH improvements... handle client disconnects, either explicit or implicit...

[prosody.git] / net / server.lua

diff --git a/net/server.lua b/net/server.lua
index 68fa5be341d1ebf77610b1ec597fc23429b47455..ccc0aa499a9c8df2275647749814817201aad0ae 100644 (file)
--- a/net/server.lua
+++ b/net/server.lua
@@ -37,7 +37,6 @@ local coroutine_wrap = coroutine.wrap
 local coroutine_yield = coroutine.yield
 local print = print;
 local out_put = function () end --print;
-local out_put = print;
 local out_error = print;
 
 --// extern libs //--
@@ -95,14 +94,13 @@ stats = function( )
        return receivestat, sendstat
 end
 
-wrapserver = function( listener, socket, ip, serverport, mode, sslctx )    -- this function wraps a server
+wrapserver = function( listener, socket, ip, serverport, mode, sslctx, wrapper_function )    -- this function wraps a server
 
        local dispatch, disconnect = listener.listener, listener.disconnect    -- dangerous
 
        local wrapclient, err
 
        out_put("Starting a new server on "..tostring(serverport).." with ssl: "..tostring(sslctx));
-       
        if sslctx then
                if not ssl_newcontext then
                        return nil, "luasec not found"
@@ -117,12 +115,16 @@ wrapserver = function( listener, socket, ip, serverport, mode, sslctx )    -- th
                        out_error( "server.lua: ", err )
                        return nil, err
                end
+       end
+       
+       if wrapper_function then
+               wrapclient = wrapper_function
+       elseif sslctx then
                wrapclient = wrapsslclient
-               wrapclient = wraptlsclient
        else
                wrapclient = wraptcpclient
        end
-
+       
        local accept = socket.accept
        local close = socket.close
 
@@ -769,7 +771,7 @@ firetimer = function( listener )
        end
 end
 
-addserver = function( listeners, port, addr, mode, sslctx )    -- this function provides a way for other scripts to reg a server
+addserver = function( listeners, port, addr, mode, sslctx, wrapper_function )    -- this function provides a way for other scripts to reg a server
        local err
        if type( listeners ) ~= "table" then
                err = "invalid listener table"
@@ -798,7 +800,7 @@ addserver = function( listeners, port, addr, mode, sslctx )    -- this function
                out_error( "server.lua: ", err )
                return nil, err
        end
-       local handler, err = wrapserver( listeners, server, addr, port, mode, sslctx )    -- wrap new server socket
+       local handler, err = wrapserver( listeners, server, addr, port, mode, sslctx, wrapper_function )    -- wrap new server socket
        if not handler then
                server:close( )
                return nil, err
@@ -878,5 +880,6 @@ return {
        closeall = closeall,
        addtimer = addtimer,
        wraptcpclient = wraptcpclient,
+       wrapsslclient = wrapsslclient,
        wraptlsclient = wraptlsclient,
 }