server_event: addclient: wrapclient already calls startconnection for us [backported...
authordaurnimator <quae@daurnimator.com>
Wed, 18 Dec 2013 23:11:47 +0000 (18:11 -0500)
committerdaurnimator <quae@daurnimator.com>
Wed, 18 Dec 2013 23:11:47 +0000 (18:11 -0500)
net/server_event.lua

index 0c3c4b040fb010063b7987bd18d8df3c70b5d799..2edc9a0c30c5c6dbecb980f436f43ad2919172bf 100644 (file)
@@ -97,7 +97,7 @@ function interface_mt:_close()
        return self:_destroy();
 end
 
-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"
@@ -730,7 +730,6 @@ local function addclient( addr, serverport, listener, pattern, sslctx, typ )
        if res or ( err == "timeout" ) then
                local ip, port = client:getsockname( )
                local interface = wrapclient( client, ip, serverport, listener, pattern, sslctx )
-               interface:_start_connection( sslctx )
                debug( "new connection id:", interface.id )
                return interface, err
        else