net.server_select: Fix global access

[prosody.git] / net / server_select.lua

diff --git a/net/server_select.lua b/net/server_select.lua
index 025f145d6567e70318e20a00773272e482a4f96c..122d774e19a9e756f1010cf5a0164785e2e6e61d 100644 (file)
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -19,7 +19,6 @@ end
 local log, table_concat = require ("util.logger").init("socket"), table.concat;
 local out_put = function (...) return log("debug", table_concat{...}); end
 local out_error = function (...) return log("warn", table_concat{...}); end
-local mem_free = collectgarbage
 
 ----------------------------------// DECLARATION //--
 
@@ -34,7 +33,6 @@ local pairs = use "pairs"
 local ipairs = use "ipairs"
 local tonumber = use "tonumber"
 local tostring = use "tostring"
-local collectgarbage = use "collectgarbage"
 
 --// lua libs //--
 
@@ -49,7 +47,6 @@ local os_difftime = os.difftime
 local math_min = math.min
 local math_huge = math.huge
 local table_concat = table.concat
-local table_remove = table.remove
 local string_len = string.len
 local string_sub = string.sub
 local coroutine_wrap = coroutine.wrap
@@ -67,7 +64,6 @@ local ssl_wrap = ( luasec and luasec.wrap )
 local socket_bind = luasocket.bind
 local socket_sleep = luasocket.sleep
 local socket_select = luasocket.select
-local ssl_newcontext = ( luasec and luasec.newcontext )
 
 --// functions //--
 
@@ -78,13 +74,13 @@ local idfalse
 local closeall
 local addsocket
 local addserver
+local addtimer
 local getserver
 local wrapserver
 local getsettings
 local closesocket
 local removesocket
 local removeserver
-local changetimeout
 local wrapconnection
 local changesettings
 
@@ -190,6 +186,9 @@ wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx, maxco
        end
        handler.remove = function( )
                connections = connections - 1
+               if handler then
+                       handler.resume( )
+               end
        end
        handler.close = function()
                socket:close( )
@@ -202,6 +201,25 @@ wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx, maxco
                --mem_free( )
                out_put "server.lua: closed server handler and removed sockets from list"
        end
+       handler.pause = function()
+               if not handler.paused then
+                       socket:close( )
+                       _sendlistlen = removesocket( _sendlist, socket, _sendlistlen )
+                       _readlistlen = removesocket( _readlist, socket, _readlistlen )
+                       _socketlist[ socket ] = nil
+                       socket = nil;
+                       handler.paused = true;
+               end
+       end
+       handler.resume = function()
+               if handler.paused then
+                       socket = socket_bind( ip, serverport );
+                       socket:settimeout( 0 )
+                       _readlistlen = addsocket(_readlist, socket, _readlistlen)
+                       _socketlist[ socket ] = handler
+                       handler.paused = false;
+               end
+       end
        handler.ip = function( )
                return ip
        end
@@ -213,6 +231,7 @@ wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx, maxco
        end
        handler.readbuffer = function( )
                if connections > maxconnections then
+                       handler.pause( )
                        out_put( "server.lua: refused new client connection: server full" )
                        return false
                end
@@ -754,16 +773,16 @@ changesettings = function( new )
        if type( new ) ~= "table" then
                return nil, "invalid settings table"
        end
-       _selecttimeout = tonumber( new.timeout ) or _selecttimeout
-       _sleeptime = tonumber( new.sleeptime ) or _sleeptime
-       _maxsendlen = tonumber( new.maxsendlen ) or _maxsendlen
-       _maxreadlen = tonumber( new.maxreadlen ) or _maxreadlen
-       _checkinterval = tonumber( new.checkinterval ) or _checkinterval
-       _sendtimeout = tonumber( new.sendtimeout ) or _sendtimeout
-       _readtimeout = tonumber( new.readtimeout ) or _readtimeout
-       _cleanqueue = new.cleanqueue
-       _maxclientsperserver = new._maxclientsperserver or _maxclientsperserver
-       _maxsslhandshake = new._maxsslhandshake or _maxsslhandshake
+       _selecttimeout = tonumber( new.select_timeout ) or _selecttimeout
+       _sleeptime = tonumber( new.select_sleep_time ) or _sleeptime
+       _maxsendlen = tonumber( new.max_send_buffer_size ) or _maxsendlen
+       _maxreadlen = tonumber( new.max_receive_buffer_size ) or _maxreadlen
+       _checkinterval = tonumber( new.select_idle_check_interval ) or _checkinterval
+       _sendtimeout = tonumber( new.send_timeout ) or _sendtimeout
+       _readtimeout = tonumber( new.read_timeout ) or _readtimeout
+       _cleanqueue = new.select_clean_queue
+       _maxclientsperserver = new.max_connections or _maxclientsperserver
+       _maxsslhandshake = new.max_ssl_handshake_roundtrips or _maxsslhandshake
        return true
 end