Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 25 Sep 2015 16:03:44 +0000 (18:03 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 25 Sep 2015 16:03:44 +0000 (18:03 +0200)
1  2 
net/server_event.lua
plugins/mod_s2s/mod_s2s.lua

index a4cf11461bb9c1f6ab5c1e0a8204f24a5ecb1613,ec8af2a4da839383a4ca9e40e96d0e774fc5307a..c0cc8467463305bd3e45b3cad4ce4cfe6a20892f
@@@ -82,391 -87,352 +87,352 @@@ local EV_SIGNAL = levent.EV_SIGNA
  
  local EV_READWRITE = bitor( EV_READ, EV_WRITE )
  
- local interfacelist = ( function( )  -- holds the interfaces for sockets
-       local array = { }
-       local len = 0
-       return function( method, arg )
-               if "add" == method then
-                       len = len + 1
-                       array[ len ] = arg
-                       arg:_position( len )
-                       return len
-               elseif "delete" == method then
-                       if len <= 0 then
-                               return nil, "array is already empty"
-                       end
-                       local position = arg:_position()  -- get position in array
-                       if position ~= len then
-                               local interface = array[ len ]  -- get last interface
-                               array[ position ] = interface  -- copy it into free position
-                               array[ len ] = nil  -- free last position
-                               interface:_position( position )  -- set new position in array
-                       else  -- free last position
-                               array[ len ] = nil
-                       end
-                       len = len - 1
-                       return len
-               else
-                       return array
-               end
-       end
- end )( )
+ local interfacelist = { }
  
  -- Client interface methods
- local interface_mt
- do
-       interface_mt = {}; interface_mt.__index = interface_mt;
+ local interface_mt = {}; interface_mt.__index = interface_mt;
  
-       local addevent = base.addevent
-       local coroutine_wrap, coroutine_yield = coroutine.wrap,coroutine.yield
+ -- Private methods
+ function interface_mt:_close()
+       return self:_destroy();
+ end
  
-       -- Private methods
-       function interface_mt:_position(new_position)
-                       self.position = new_position or self.position
-                       return self.position;
 -function interface_mt:_start_connection(plainssl) -- should be called from addclient
++function interface_mt:_start_connection(plainssl) -- called from wrapclient
+       local callback = function( event )
+               if EV_TIMEOUT == event then  -- timeout during connection
+                       self.fatalerror = "connection timeout"
+                       self:ontimeout()  -- call timeout listener
+                       self:_close()
+                       debug( "new connection failed. id:", self.id, "error:", self.fatalerror )
+               else
+                       if plainssl and has_luasec then  -- start ssl session
+                               self:starttls(self._sslctx, true)
+                       else  -- normal connection
+                               self:_start_session(true)
+                       end
+                       debug( "new connection established. id:", self.id )
+               end
+               self.eventconnect = nil
+               return -1
        end
-       function interface_mt:_close()
-               return self:_destroy();
+       self.eventconnect = addevent( base, self.conn, EV_WRITE, callback, cfg.CONNECT_TIMEOUT )
+       return true
+ end
+ function interface_mt:_start_session(call_onconnect) -- new session, for example after startssl
+       if self.type == "client" then
+               local callback = function( )
+                       self:_lock( false,  false, false )
+                       --vdebug( "start listening on client socket with id:", self.id )
+                       self.eventread = addevent( base, self.conn, EV_READ, self.readcallback, cfg.READ_TIMEOUT );  -- register callback
+                       if call_onconnect then
+                               self:onconnect()
+                       end
+                       self.eventsession = nil
+                       return -1
+               end
+               self.eventsession = addevent( base, nil, EV_TIMEOUT, callback, 0 )
+       else
+               self:_lock( false )
+               --vdebug( "start listening on server socket with id:", self.id )
+               self.eventread = addevent( base, self.conn, EV_READ, self.readcallback )  -- register callback
        end
-       function interface_mt:_start_connection(plainssl) -- called from wrapclient
-                       local callback = function( event )
-                               if EV_TIMEOUT == event then  -- timeout during connection
-                                       self.fatalerror = "connection timeout"
-                                       self:ontimeout()  -- call timeout listener
-                                       self:_close()
-                                       debug( "new connection failed. id:", self.id, "error:", self.fatalerror )
-                               else
-                                       if plainssl and has_luasec then  -- start ssl session
-                                               self:starttls(self._sslctx, true)
-                                       else  -- normal connection
-                                               self:_start_session(true)
+       return true
+ end
+ function interface_mt:_start_ssl(call_onconnect) -- old socket will be destroyed, therefore we have to close read/write events first
+       --vdebug( "starting ssl session with client id:", self.id )
+       local _
+       _ = self.eventread and self.eventread:close( )  -- close events; this must be called outside of the event callbacks!
+       _ = self.eventwrite and self.eventwrite:close( )
+       self.eventread, self.eventwrite = nil, nil
+       local err
+       self.conn, err = ssl.wrap( self.conn, self._sslctx )
+       if err then
+               self.fatalerror = err
+               self.conn = nil  -- cannot be used anymore
+               if call_onconnect then
+                       self.ondisconnect = nil  -- dont call this when client isnt really connected
+               end
+               self:_close()
+               debug( "fatal error while ssl wrapping:", err )
+               return false
+       end
+       self.conn:settimeout( 0 )  -- set non blocking
+       local handshakecallback = coroutine_wrap(function( event )
+               local _, err
+               local attempt = 0
+               local maxattempt = cfg.MAX_HANDSHAKE_ATTEMPTS
+               while attempt < maxattempt do  -- no endless loop
+                       attempt = attempt + 1
+                       debug( "ssl handshake of client with id:"..tostring(self)..", attempt:"..attempt )
+                       if attempt > maxattempt then
+                               self.fatalerror = "max handshake attempts exceeded"
+                       elseif EV_TIMEOUT == event then
+                               self.fatalerror = "timeout during handshake"
+                       else
+                               _, err = self.conn:dohandshake( )
+                               if not err then
+                                       self:_lock( false, false, false )  -- unlock the interface; sending, closing etc allowed
+                                       self.send = self.conn.send  -- caching table lookups with new client object
+                                       self.receive = self.conn.receive
+                                       if not call_onconnect then  -- trigger listener
+                                               self:onstatus("ssl-handshake-complete");
                                        end
-                                       debug( "new connection established. id:", self.id )
+                                       self:_start_session( call_onconnect )
+                                       debug( "ssl handshake done" )
+                                       self.eventhandshake = nil
+                                       return -1
                                end
-                               self.eventconnect = nil
-                               return -1
-                       end
-                       self.eventconnect = addevent( base, self.conn, EV_WRITE, callback, cfg.CONNECT_TIMEOUT )
-                       return true
-       end
-       function interface_mt:_start_session(call_onconnect) -- new session, for example after startssl
-               if self.type == "client" then
-                       local callback = function( )
-                               self:_lock( false,  false, false )
-                               --vdebug( "start listening on client socket with id:", self.id )
-                               self.eventread = addevent( base, self.conn, EV_READ, self.readcallback, cfg.READ_TIMEOUT );  -- register callback
-                               if call_onconnect then
-                                       self:onconnect()
+                               if err == "wantwrite" then
+                                       event = EV_WRITE
+                               elseif err == "wantread" then
+                                       event = EV_READ
+                               else
+                                       debug( "ssl handshake error:", err )
+                                       self.fatalerror = err
                                end
-                               self.eventsession = nil
-                               return -1
                        end
-                       self.eventsession = addevent( base, nil, EV_TIMEOUT, callback, 0 )
-               else
-                       self:_lock( false )
-                       --vdebug( "start listening on server socket with id:", self.id )
-                       self.eventread = addevent( base, self.conn, EV_READ, self.readcallback )  -- register callback
-               end
-               return true
-       end
-       function interface_mt:_start_ssl(call_onconnect) -- old socket will be destroyed, therefore we have to close read/write events first
-                       --vdebug( "starting ssl session with client id:", self.id )
-                       local _
-                       _ = self.eventread and self.eventread:close( )  -- close events; this must be called outside of the event callbacks!
-                       _ = self.eventwrite and self.eventwrite:close( )
-                       self.eventread, self.eventwrite = nil, nil
-                       local err
-                       self.conn, err = ssl.wrap( self.conn, self._sslctx )
-                       if err then
-                               self.fatalerror = err
-                               self.conn = nil  -- cannot be used anymore
+                       if self.fatalerror then
                                if call_onconnect then
                                        self.ondisconnect = nil  -- dont call this when client isnt really connected
                                end
                                self:_close()
-                               debug( "fatal error while ssl wrapping:", err )
-                               return false
-                       end
-                       self.conn:settimeout( 0 )  -- set non blocking
-                       local handshakecallback = coroutine_wrap(
-                               function( event )
-                                       local _, err
-                                       local attempt = 0
-                                       local maxattempt = cfg.MAX_HANDSHAKE_ATTEMPTS
-                                       while attempt < maxattempt do  -- no endless loop
-                                               attempt = attempt + 1
-                                               debug( "ssl handshake of client with id:"..tostring(self)..", attempt:"..attempt )
-                                               if attempt > maxattempt then
-                                                       self.fatalerror = "max handshake attempts exceeded"
-                                               elseif EV_TIMEOUT == event then
-                                                       self.fatalerror = "timeout during handshake"
-                                               else
-                                                       _, err = self.conn:dohandshake( )
-                                                       if not err then
-                                                               self:_lock( false, false, false )  -- unlock the interface; sending, closing etc allowed
-                                                               self.send = self.conn.send  -- caching table lookups with new client object
-                                                               self.receive = self.conn.receive
-                                                               if not call_onconnect then  -- trigger listener
-                                                                       self:onstatus("ssl-handshake-complete");
-                                                               end
-                                                               self:_start_session( call_onconnect )
-                                                               debug( "ssl handshake done" )
-                                                               self.eventhandshake = nil
-                                                               return -1
-                                                       end
-                                                       if err == "wantwrite" then
-                                                               event = EV_WRITE
-                                                       elseif err == "wantread" then
-                                                               event = EV_READ
-                                                       else
-                                                               debug( "ssl handshake error:", err )
-                                                               self.fatalerror = err
-                                                       end
-                                               end
-                                               if self.fatalerror then
-                                                       if call_onconnect then
-                                                               self.ondisconnect = nil  -- dont call this when client isnt really connected
-                                                       end
-                                                       self:_close()
-                                                       debug( "handshake failed because:", self.fatalerror )
-                                                       self.eventhandshake = nil
-                                                       return -1
-                                               end
-                                               event = coroutine_yield( event, cfg.HANDSHAKE_TIMEOUT )  -- yield this monster...
-                                       end
-                               end
-                       )
-                       debug "starting handshake..."
-                       self:_lock( false, true, true )  -- unlock read/write events, but keep interface locked
-                       self.eventhandshake = addevent( base, self.conn, EV_READWRITE, handshakecallback, cfg.HANDSHAKE_TIMEOUT )
-                       return true
-       end
-       function interface_mt:_destroy()  -- close this interface + events and call last listener
-                       debug( "closing client with id:", self.id, self.fatalerror )
-                       self:_lock( true, true, true )  -- first of all, lock the interface to avoid further actions
-                       local _
-                       _ = self.eventread and self.eventread:close( )
-                       if self.type == "client" then
-                               _ = self.eventwrite and self.eventwrite:close( )
-                               _ = self.eventhandshake and self.eventhandshake:close( )
-                               _ = self.eventstarthandshake and self.eventstarthandshake:close( )
-                               _ = self.eventconnect and self.eventconnect:close( )
-                               _ = self.eventsession and self.eventsession:close( )
-                               _ = self.eventwritetimeout and self.eventwritetimeout:close( )
-                               _ = self.eventreadtimeout and self.eventreadtimeout:close( )
-                               _ = self.ondisconnect and self:ondisconnect( self.fatalerror ~= "client to close" and self.fatalerror)  -- call ondisconnect listener (wont be the case if handshake failed on connect)
-                               _ = self.conn and self.conn:close( ) -- close connection
-                               _ = self._server and self._server:counter(-1);
-                               self.eventread, self.eventwrite = nil, nil
-                               self.eventstarthandshake, self.eventhandshake, self.eventclose = nil, nil, nil
-                               self.readcallback, self.writecallback = nil, nil
-                       else
-                               self.conn:close( )
-                               self.eventread, self.eventclose = nil, nil
-                               self.interface, self.readcallback = nil, nil
+                               debug( "handshake failed because:", self.fatalerror )
+                               self.eventhandshake = nil
+                               return -1
                        end
-                       interfacelist( "delete", self )
-                       return true
+                       event = coroutine_yield( event, cfg.HANDSHAKE_TIMEOUT )  -- yield this monster...
+               end
        end
+       )
+       debug "starting handshake..."
+       self:_lock( false, true, true )  -- unlock read/write events, but keep interface locked
+       self.eventhandshake = addevent( base, self.conn, EV_READWRITE, handshakecallback, cfg.HANDSHAKE_TIMEOUT )
+       return true
+ end
+ function interface_mt:_destroy()  -- close this interface + events and call last listener
+       debug( "closing client with id:", self.id, self.fatalerror )
+       self:_lock( true, true, true )  -- first of all, lock the interface to avoid further actions
+       local _
+       _ = self.eventread and self.eventread:close( )
+       if self.type == "client" then
+               _ = self.eventwrite and self.eventwrite:close( )
+               _ = self.eventhandshake and self.eventhandshake:close( )
+               _ = self.eventstarthandshake and self.eventstarthandshake:close( )
+               _ = self.eventconnect and self.eventconnect:close( )
+               _ = self.eventsession and self.eventsession:close( )
+               _ = self.eventwritetimeout and self.eventwritetimeout:close( )
+               _ = self.eventreadtimeout and self.eventreadtimeout:close( )
+               _ = self.ondisconnect and self:ondisconnect( self.fatalerror ~= "client to close" and self.fatalerror)  -- call ondisconnect listener (wont be the case if handshake failed on connect)
+               _ = self.conn and self.conn:close( ) -- close connection
+               _ = self._server and self._server:counter(-1);
+               self.eventread, self.eventwrite = nil, nil
+               self.eventstarthandshake, self.eventhandshake, self.eventclose = nil, nil, nil
+               self.readcallback, self.writecallback = nil, nil
+       else
+               self.conn:close( )
+               self.eventread, self.eventclose = nil, nil
+               self.interface, self.readcallback = nil, nil
+       end
+       interfacelist[ self ] = nil
+       return true
+ end
  
-       function interface_mt:_lock(nointerface, noreading, nowriting)  -- lock or unlock this interface or events
-                       self.nointerface, self.noreading, self.nowriting = nointerface, noreading, nowriting
-                       return nointerface, noreading, nowriting
-       end
+ function interface_mt:_lock(nointerface, noreading, nowriting)  -- lock or unlock this interface or events
 -      self.nointerface, self.noreading, self.nowriting = nointerface, noreading, nowriting
 -      return nointerface, noreading, nowriting
++              self.nointerface, self.noreading, self.nowriting = nointerface, noreading, nowriting
++              return nointerface, noreading, nowriting
+ end
  
-       --TODO: Deprecate
-       function interface_mt:lock_read(switch)
-               if switch then
-                       return self:pause();
-               else
-                       return self:resume();
-               end
+ --TODO: Deprecate
+ function interface_mt:lock_read(switch)
+       if switch then
+               return self:pause();
+       else
+               return self:resume();
        end
+ end
  
      function interface_mt:pause()
-               return self:_lock(self.nointerface, true, self.nowriting);
      end
+ function interface_mt:pause()
+       return self:_lock(self.nointerface, true, self.nowriting);
+ end
  
-       function interface_mt:resume()
-               self:_lock(self.nointerface, false, self.nowriting);
-               if not self.eventread then
-                       self.eventread = addevent( base, self.conn, EV_READ, self.readcallback, cfg.READ_TIMEOUT );  -- register callback
-               end
+ function interface_mt:resume()
+       self:_lock(self.nointerface, false, self.nowriting);
+       if not self.eventread then
+               self.eventread = addevent( base, self.conn, EV_READ, self.readcallback, cfg.READ_TIMEOUT );  -- register callback
        end
+ end
  
-       function interface_mt:counter(c)
-               if c then
-                       self._connections = self._connections + c
-               end
-               return self._connections
-       end
-       -- Public methods
-       function interface_mt:write(data)
-               if self.nowriting then return nil, "locked" end
-               --vdebug( "try to send data to client, id/data:", self.id, data )
-               data = tostring( data )
-               local len = #data
-               local total = len + self.writebufferlen
-               if total > cfg.MAX_SEND_LENGTH then  -- check buffer length
-                       local err = "send buffer exceeded"
-                       debug( "error:", err )  -- to much, check your app
-                       return nil, err
-               end
-               t_insert(self.writebuffer, data) -- new buffer
-               self.writebufferlen = total
-               if not self.eventwrite then  -- register new write event
-                       --vdebug( "register new write event" )
-                       self.eventwrite = addevent( base, self.conn, EV_WRITE, self.writecallback, cfg.WRITE_TIMEOUT )
-               end
-               return true
+ function interface_mt:counter(c)
+       if c then
+               self._connections = self._connections + c
        end
-       function interface_mt:close()
-               if self.nointerface then return nil, "locked"; end
-               debug( "try to close client connection with id:", self.id )
-               if self.type == "client" then
-                       self.fatalerror = "client to close"
-                       if self.eventwrite then -- wait for incomplete write request
-                               self:_lock( true, true, false )
-                               debug "closing delayed until writebuffer is empty"
-                               return nil, "writebuffer not empty, waiting"
-                       else -- close now
-                               self:_lock( true, true, true )
-                               self:_close()
-                               return true
-                       end
-               else
-                       debug( "try to close server with id:", tostring(self.id))
-                       self.fatalerror = "server to close"
-                       self:_lock( true )
-                       self:_close( 0 )
+       return self._connections
+ end
+ -- Public methods
+ function interface_mt:write(data)
+       if self.nowriting then return nil, "locked" end
+       --vdebug( "try to send data to client, id/data:", self.id, data )
+       data = tostring( data )
+       local len = #data
+       local total = len + self.writebufferlen
+       if total > cfg.MAX_SEND_LENGTH then  -- check buffer length
+               local err = "send buffer exceeded"
+               debug( "error:", err )  -- to much, check your app
+               return nil, err
+       end
+       t_insert(self.writebuffer, data) -- new buffer
+       self.writebufferlen = total
+       if not self.eventwrite then  -- register new write event
+               --vdebug( "register new write event" )
+               self.eventwrite = addevent( base, self.conn, EV_WRITE, self.writecallback, cfg.WRITE_TIMEOUT )
+       end
+       return true
+ end
+ function interface_mt:close()
+       if self.nointerface then return nil, "locked"; end
+       debug( "try to close client connection with id:", self.id )
+       if self.type == "client" then
+               self.fatalerror = "client to close"
+               if self.eventwrite then -- wait for incomplete write request
+                       self:_lock( true, true, false )
+                       debug "closing delayed until writebuffer is empty"
+                       return nil, "writebuffer not empty, waiting"
+               else -- close now
+                       self:_lock( true, true, true )
+                       self:_close()
                        return true
                end
+       else
+               debug( "try to close server with id:", tostring(self.id))
+               self.fatalerror = "server to close"
+               self:_lock( true )
+               self:_close( 0 )
+               return true
        end
+ end
  
      function interface_mt:socket()
-               return self.conn
      end
+ function interface_mt:socket()
+       return self.conn
+ end
  
      function interface_mt:server()
-               return self._server or self;
      end
+ function interface_mt:server()
+       return self._server or self;
+ end
  
      function interface_mt:port()
-               return self._port
      end
+ function interface_mt:port()
+       return self._port
+ end
  
      function interface_mt:serverport()
-               return self._serverport
      end
+ function interface_mt:serverport()
+       return self._serverport
+ end
  
      function interface_mt:ip()
-               return self._ip
      end
+ function interface_mt:ip()
+       return self._ip
+ end
  
      function interface_mt:ssl()
-               return self._usingssl
      end
      interface_mt.clientport = interface_mt.port -- COMPAT server_select
+ function interface_mt:ssl()
+       return self._usingssl
+ end
+ interface_mt.clientport = interface_mt.port -- COMPAT server_select
  
      function interface_mt:type()
-               return self._type or "client"
      end
+ function interface_mt:type()
+       return self._type or "client"
+ end
  
      function interface_mt:connections()
-               return self._connections
      end
+ function interface_mt:connections()
+       return self._connections
+ end
  
      function interface_mt:address()
-               return self.addr
      end
+ function interface_mt:address()
+       return self.addr
+ end
  
-       function interface_mt:set_sslctx(sslctx)
-               self._sslctx = sslctx;
-               if sslctx then
-                       self.starttls = nil; -- use starttls() of interface_mt
-               else
-                       self.starttls = false; -- prevent starttls()
-               end
+ function interface_mt:set_sslctx(sslctx)
+       self._sslctx = sslctx;
+       if sslctx then
+               self.starttls = nil; -- use starttls() of interface_mt
+       else
+               self.starttls = false; -- prevent starttls()
        end
+ end
  
-       function interface_mt:set_mode(pattern)
-               if pattern then
-                       self._pattern = pattern;
-               end
-               return self._pattern;
+ function interface_mt:set_mode(pattern)
+       if pattern then
+               self._pattern = pattern;
        end
+       return self._pattern;
+ end
  
-       function interface_mt:set_send(new_send)
-               -- No-op, we always use the underlying connection's send
      end
+ function interface_mt:set_send(new_send) -- luacheck: ignore 212
+       -- No-op, we always use the underlying connection's send
+ end
  
      function interface_mt:starttls(sslctx, call_onconnect)
-               debug( "try to start ssl at client id:", self.id )
-               local err
-               self._sslctx = sslctx;
-               if self._usingssl then  -- startssl was already called
-                       err = "ssl already active"
-               end
-               if err then
-                       debug( "error:", err )
-                       return nil, err
-               end
-               self._usingssl = true
-               self.startsslcallback = function( )  -- we have to start the handshake outside of a read/write event
-                       self.startsslcallback = nil
-                       self:_start_ssl(call_onconnect);
-                       self.eventstarthandshake = nil
-                       return -1
-               end
-               if not self.eventwrite then
-                       self:_lock( true, true, true )  -- lock the interface, to not disturb the handshake
-                       self.eventstarthandshake = addevent( base, nil, EV_TIMEOUT, self.startsslcallback, 0 )  -- add event to start handshake
-               else  -- wait until writebuffer is empty
-                       self:_lock( true, true, false )
-                       debug "ssl session delayed until writebuffer is empty..."
-               end
-               self.starttls = false;
-               return true
      end
+ function interface_mt:starttls(sslctx, call_onconnect)
+       debug( "try to start ssl at client id:", self.id )
+       local err
+       self._sslctx = sslctx;
+       if self._usingssl then  -- startssl was already called
+               err = "ssl already active"
+       end
+       if err then
+               debug( "error:", err )
+               return nil, err
+       end
+       self._usingssl = true
+       self.startsslcallback = function( )  -- we have to start the handshake outside of a read/write event
+               self.startsslcallback = nil
+               self:_start_ssl(call_onconnect);
+               self.eventstarthandshake = nil
+               return -1
+       end
+       if not self.eventwrite then
+               self:_lock( true, true, true )  -- lock the interface, to not disturb the handshake
+               self.eventstarthandshake = addevent( base, nil, EV_TIMEOUT, self.startsslcallback, 0 )  -- add event to start handshake
+       else  -- wait until writebuffer is empty
+               self:_lock( true, true, false )
+               debug "ssl session delayed until writebuffer is empty..."
+       end
+       self.starttls = false;
+       return true
+ end
  
-       function interface_mt:setoption(option, value)
-               if self.conn.setoption then
-                       return self.conn:setoption(option, value);
-               end
-               return false, "setoption not implemented";
+ function interface_mt:setoption(option, value)
+       if self.conn.setoption then
+               return self.conn:setoption(option, value);
        end
+       return false, "setoption not implemented";
+ end
  
      function interface_mt:setlistener(listener)
-               self:ondetach(); -- Notify listener that it is no longer responsible for this connection
-               self.onconnect, self.ondisconnect, self.onincoming, self.ontimeout,
-               self.onreadtimeout, self.onstatus, self.ondetach
-                       = listener.onconnect, listener.ondisconnect, listener.onincoming, listener.ontimeout,
-                         listener.onreadtimeout, listener.onstatus, listener.ondetach;
      end
+ function interface_mt:setlistener(listener)
+       self:ondetach(); -- Notify listener that it is no longer responsible for this connection
+       self.onconnect, self.ondisconnect, self.onincoming, self.ontimeout,
+       self.onreadtimeout, self.onstatus, self.ondetach
+               = listener.onconnect, listener.ondisconnect, listener.onincoming, listener.ontimeout,
+                 listener.onreadtimeout, listener.onstatus, listener.ondetach;
+ end
  
-       -- Stub handlers
-       function interface_mt:onconnect()
-       end
-       function interface_mt:onincoming()
-       end
-       function interface_mt:ondisconnect()
-       end
-       function interface_mt:ontimeout()
-       end
-       function interface_mt:onreadtimeout()
-               self.fatalerror = "timeout during receiving"
-               debug( "connection failed:", self.fatalerror )
-               self:_close()
-               self.eventread = nil
-       end
-       function interface_mt:ondrain()
-       end
-       function interface_mt:ondetach()
-       end
-       function interface_mt:onstatus()
-       end
+ -- Stub handlers
+ function interface_mt:onconnect()
+ end
+ function interface_mt:onincoming()
+ end
+ function interface_mt:ondisconnect()
+ end
+ function interface_mt:ontimeout()
+ end
+ function interface_mt:onreadtimeout()
+       self.fatalerror = "timeout during receiving"
+       debug( "connection failed:", self.fatalerror )
+       self:_close()
+       self.eventread = nil
+ end
+ function interface_mt:ondrain()
+ end
+ function interface_mt:ondetach()
+ end
+ function interface_mt:onstatus()
  end
  
  -- End of client interface methods
@@@ -613,170 -593,143 +593,142 @@@ local function handleclient( client, ip
                                interface.eventread = nil
                                return -1
                        end
-                       if err and ( err ~= "timeout" and err ~= "wantread" ) then
-                               if "wantwrite" == err then -- need to read on write event
-                                       if not interface.eventwrite then  -- register new write event if needed
-                                               interface.eventwrite = addevent( base, interface.conn, EV_WRITE, interface.writecallback, cfg.WRITE_TIMEOUT )
-                                       end
-                                       interface.eventreadtimeout = addevent( base, nil, EV_TIMEOUT,
-                                               function( )
-                                                       interface:_close()
-                                               end, cfg.READ_TIMEOUT
-                                       )
-                                       debug( "wantwrite during read attempt, reg it in writecallback but dont know what really happens next..." )
-                                       -- to be honest i dont know what happens next, if it is allowed to first read, the write etc...
-                               else  -- connection was closed or fatal error
-                                       interface.fatalerror = err
-                                       debug( "connection failed in read event:", interface.fatalerror )
-                                       interface:_close()
-                                       interface.eventread = nil
-                                       return -1
-                               end
+               else
+                       interface.onincoming( interface, buffer, err )  -- send new data to listener
+               end
+               if interface.noreading then
+                       interface.eventread = nil;
+                       return -1;
+               end
+               return EV_READ, cfg.READ_TIMEOUT
+       end
+       client:settimeout( 0 )  -- set non blocking
+       setmetatable(interface, interface_mt)
+       interfacelist[ interface ] = true  -- add to interfacelist
+       return interface
+ end
+ local function handleserver( server, addr, port, pattern, listener, sslctx )  -- creates an server interface
+       debug "creating server interface..."
+       local interface = {
+               _connections = 0;
+               conn = server;
+               onconnect = listener.onconnect;  -- will be called when new client connected
+               eventread = false;  -- read event handler
+               eventclose = false; -- close event handler
+               readcallback = false; -- read event callback
+               fatalerror = false; -- error message
+               nointerface = true;  -- lock/unlock parameter
+               _ip = addr, _port = port, _pattern = pattern,
+               _sslctx = sslctx;
+       }
+       interface.id = tostring(interface):match("%x+$");
+       interface.readcallback = function( event )  -- server handler, called on incoming connections
+               --vdebug( "server can accept, id/addr/port:", interface, addr, port )
+               if interface.fatalerror then
+                       --vdebug( "leaving this event because:", self.fatalerror )
+                       interface.eventread = nil
+                       return -1
+               end
+               local delay = cfg.ACCEPT_DELAY
+               if EV_TIMEOUT == event then
+                       if interface._connections >= cfg.MAX_CONNECTIONS then  -- check connection count
+                               debug( "to many connections, seconds to wait for next accept:", delay )
+                               return EV_TIMEOUT, delay  -- timeout...
                        else
-                               interface.onincoming( interface, buffer, err )  -- send new data to listener
+                               return EV_READ  -- accept again
                        end
-                       if interface.noreading then
-                               interface.eventread = nil;
-                               return -1;
-                       end
-                       return EV_READ, cfg.READ_TIMEOUT
                end
-               client:settimeout( 0 )  -- set non blocking
-               setmetatable(interface, interface_mt)
-               interfacelist( "add", interface )  -- add to interfacelist
-               return interface
-       end
- end
- local handleserver
- do
-       function handleserver( server, addr, port, pattern, listener, sslctx )  -- creates an server interface
-               debug "creating server interface..."
-               local interface = {
-                       _connections = 0;
-                       conn = server;
-                       onconnect = listener.onconnect;  -- will be called when new client connected
-                       eventread = false;  -- read event handler
-                       eventclose = false; -- close event handler
-                       readcallback = false; -- read event callback
-                       fatalerror = false; -- error message
-                       nointerface = true;  -- lock/unlock parameter
-                       _ip = addr, _port = port, _pattern = pattern,
-                       _sslctx = sslctx;
-               }
-               interface.id = tostring(interface):match("%x+$");
-               interface.readcallback = function( event )  -- server handler, called on incoming connections
-                       --vdebug( "server can accept, id/addr/port:", interface, addr, port )
-                       if interface.fatalerror then
-                               --vdebug( "leaving this event because:", self.fatalerror )
-                               interface.eventread = nil
-                               return -1
+               --vdebug("max connection check ok, accepting...")
+               local client, err = server:accept()    -- try to accept; TODO: check err
+               while client do
+                       if interface._connections >= cfg.MAX_CONNECTIONS then
+                               client:close( )  -- refuse connection
+                               debug( "maximal connections reached, refuse client connection; accept delay:", delay )
+                               return EV_TIMEOUT, delay  -- delay for next accept attempt
                        end
-                       local delay = cfg.ACCEPT_DELAY
-                       if EV_TIMEOUT == event then
-                               if interface._connections >= cfg.MAX_CONNECTIONS then  -- check connection count
-                                       debug( "to many connections, seconds to wait for next accept:", delay )
-                                       return EV_TIMEOUT, delay  -- timeout...
-                               else
-                                       return EV_READ  -- accept again
-                               end
+                       local client_ip, client_port = client:getpeername( )
+                       interface._connections = interface._connections + 1  -- increase connection count
+                       local clientinterface = handleclient( client, client_ip, client_port, interface, pattern, listener, sslctx )
+                       --vdebug( "client id:", clientinterface, "startssl:", startssl )
+                       if has_luasec and sslctx then
+                               clientinterface:starttls(sslctx, true)
+                       else
+                               clientinterface:_start_session( true )
                        end
-                       --vdebug("max connection check ok, accepting...")
-                       local client, err = server:accept()    -- try to accept; TODO: check err
-                       while client do
-                               if interface._connections >= cfg.MAX_CONNECTIONS then
-                                       client:close( )  -- refuse connection
-                                       debug( "maximal connections reached, refuse client connection; accept delay:", delay )
-                                       return EV_TIMEOUT, delay  -- delay for next accept attempt
-                               end
-                               local client_ip, client_port = client:getpeername( )
-                               interface._connections = interface._connections + 1  -- increase connection count
-                               local clientinterface = handleclient( client, client_ip, client_port, interface, pattern, listener, sslctx )
-                               --vdebug( "client id:", clientinterface, "startssl:", startssl )
-                               if has_luasec and sslctx then
-                                       clientinterface:starttls(sslctx, true)
-                               else
-                                       clientinterface:_start_session( true )
-                               end
-                               debug( "accepted incoming client connection from:", client_ip or "<unknown IP>", client_port or "<unknown port>", "to", port or "<unknown port>");
+                       debug( "accepted incoming client connection from:", client_ip or "<unknown IP>", client_port or "<unknown port>", "to", port or "<unknown port>");
  
-                               client, err = server:accept()    -- try to accept again
-                       end
-                       return EV_READ
+                       client, err = server:accept()    -- try to accept again
                end
-               server:settimeout( 0 )
-               setmetatable(interface, interface_mt)
-               interfacelist( "add", interface )
-               interface:_start_session()
-               return interface
+               return EV_READ
        end
+       server:settimeout( 0 )
+       setmetatable(interface, interface_mt)
+       interfacelist[ interface ] = true
+       interface:_start_session()
+       return interface
  end
  
- local addserver = ( function( )
-       return function( addr, port, listener, pattern, sslctx, startssl )  -- TODO: check arguments
-               --vdebug( "creating new tcp server with following parameters:", addr or "nil", port or "nil", sslctx or "nil", startssl or "nil")
-               if sslctx and not has_luasec then
-                       debug "fatal error: luasec not found"
-                       return nil, "luasec not found"
-               end
-               local server, err = socket.bind( addr, port, cfg.ACCEPT_QUEUE )  -- create server socket
-               if not server then
-                       debug( "creating server socket on "..addr.." port "..port.." failed:", err )
-                       return nil, err
-               end
-               local interface = handleserver( server, addr, port, pattern, listener, sslctx, startssl )  -- new server handler
-               debug( "new server created with id:", tostring(interface))
-               return interface
+ local function addserver( addr, port, listener, pattern, sslctx, startssl )  -- TODO: check arguments
+       --vdebug( "creating new tcp server with following parameters:", addr or "nil", port or "nil", sslctx or "nil", startssl or "nil")
+       if sslctx and not has_luasec then
+               debug "fatal error: luasec not found"
+               return nil, "luasec not found"
        end
- end )( )
- local addclient, wrapclient
- do
-       function wrapclient( client, ip, port, listeners, pattern, sslctx )
-               local interface = handleclient( client, ip, port, nil, pattern, listeners, sslctx )
-               interface:_start_connection(sslctx)
-               return interface, client
-               --function handleclient( client, ip, port, server, pattern, listener, _, sslctx )  -- creates an client interface
+       local server, err = socket.bind( addr, port, cfg.ACCEPT_QUEUE )  -- create server socket
+       if not server then
+               debug( "creating server socket on "..addr.." port "..port.." failed:", err )
+               return nil, err
        end
+       local interface = handleserver( server, addr, port, pattern, listener, sslctx, startssl )  -- new server handler
+       debug( "new server created with id:", tostring(interface))
+       return interface
+ end
  
-       function addclient( addr, serverport, listener, pattern, sslctx, typ )
-               if sslctx and not has_luasec then
-                       debug "need luasec, but not available"
-                       return nil, "luasec not found"
-               end
-               if getaddrinfo and not typ then
-                       local addrinfo, err = getaddrinfo(addr)
-                       if not addrinfo then return nil, err end
-                       if addrinfo[1] and addrinfo[1].family == "inet6" then
-                               typ = "tcp6"
-                       end
-               end
-               local create = socket[typ or "tcp"]
-               if type( create ) ~= "function"  then
-                       return nil, "invalid socket type"
-                       end
-               local client, err = create()  -- creating new socket
-               if not client then
-                       debug( "cannot create socket:", err )
-                               return nil, err
-                       end
-               client:settimeout( 0 )  -- set nonblocking
-               local res, err = client:connect( addr, serverport )  -- connect
-               if res or ( err == "timeout" or err == "Operation already in progress" ) then
-                       if client.getsockname then
-                               addr = client:getsockname( )
+ local function wrapclient( client, ip, port, listeners, pattern, sslctx )
+       local interface = handleclient( client, ip, port, nil, pattern, listeners, sslctx )
+       interface:_start_connection(sslctx)
+       return interface, client
+       --function handleclient( client, ip, port, server, pattern, listener, _, sslctx )  -- creates an client interface
+ end
+ local function addclient( addr, serverport, listener, pattern, sslctx, typ )
+       if sslctx and not has_luasec then
+               debug "need luasec, but not available"
+               return nil, "luasec not found"
+       end
 -      if not typ then
++      if getaddrinfo and not typ then
+               local addrinfo, err = getaddrinfo(addr)
+               if not addrinfo then return nil, err end
+               if addrinfo[1] and addrinfo[1].family == "inet6" then
+                       typ = "tcp6"
 -              else
 -                      typ = "tcp"
                end
-                       local interface = wrapclient( client, addr, serverport, listener, pattern, sslctx )
-                       debug( "new connection id:", interface.id )
-                       return interface, err
-               else
-                       debug( "new connection failed:", err )
-                       return nil, err
+       end
 -      local create = socket[typ]
++      local create = socket[typ or "tcp"]
+       if type( create ) ~= "function"  then
+               return nil, "invalid socket type"
+       end
+       local client, err = create()  -- creating new socket
+       if not client then
+               debug( "cannot create socket:", err )
+               return nil, err
+       end
+       client:settimeout( 0 )  -- set nonblocking
+       local res, err = client:connect( addr, serverport )  -- connect
 -      if res or ( err == "timeout" ) then
 -              local ip, port = client:getsockname( )
 -              local interface = wrapclient( client, ip, serverport, listener, pattern, sslctx )
 -              interface:_start_connection( sslctx )
++      if res or ( err == "timeout" or err == "Operation already in progress" ) then
++              if client.getsockname then
++                      addr = client:getsockname( )
 +              end
++              local interface = wrapclient( client, addr, serverport, listener, pattern, sslctx )
+               debug( "new connection id:", interface.id )
+               return interface, err
+       else
+               debug( "new connection failed:", err )
+               return nil, err
        end
  end
  
@@@ -786,15 -738,12 +737,12 @@@ local function loop( )  -- starts the e
        return "quitting";
  end
  
- local newevent = ( function( )
-       local add = base.addevent
-       return function( ... )
-               return add( base, ... )
+ local function newevent( ... )
+       return addevent( base, ... )
 -end
 +      end
- end )( )
  
- local closeallservers = function( arg )
-       for _, item in ipairs( interfacelist( ) ) do
+ local function closeallservers ( arg )
+       for item in pairs( interfacelist ) do
                if item.type == "server" then
                        item:close( arg )
                end
@@@ -848,25 -797,7 +796,24 @@@ local function link(sender, receiver, b
        sender:set_mode("*a");
  end
  
 +local add_task do
 +      local EVENT_LEAVE = (event.core and event.core.LEAVE) or -1;
 +      local socket_gettime = socket.gettime
 +      function add_task(delay, callback)
 +              local event_handle;
 +              event_handle = base:addevent(nil, 0, function ()
 +                      local ret = callback(socket_gettime());
 +                      if ret then
 +                              return 0, ret;
 +                      elseif event_handle then
 +                              return EVENT_LEAVE;
 +                      end
 +              end
 +              , delay);
 +      end
 +end
 +
  return {
        cfg = cfg,
        base = base,
        loop = loop,
Simple merge