net/server_event: add_client should have same arguments no-matter the server backend
authordaurnimator <quae@daurnimator.com>
Wed, 18 Dec 2013 22:52:28 +0000 (17:52 -0500)
committerdaurnimator <quae@daurnimator.com>
Wed, 18 Dec 2013 22:52:28 +0000 (17:52 -0500)
net/server_event.lua

index daac7746ad6504dc5c9f2709a26e2f58f65380fe..00c997849d6999a9d77ed0dbb53842e4e99677d9 100644 (file)
@@ -750,36 +750,21 @@ do
                --function handleclient( client, ip, port, server, pattern, listener, _, sslctx )  -- creates an client interface
        end
 
-       function addclient( addr, serverport, listener, pattern, localaddr, localport, sslcfg, startssl )
+       function addclient( addr, serverport, listener, pattern, sslctx )
+               if sslctx and not ssl then
+                       debug "need luasec, but not available"
+                       return nil, "luasec not found"
+               end
                local client, err = socket.tcp()  -- creating new socket
                if not client then
                        debug( "cannot create socket:", err )
                        return nil, err
                end
                client:settimeout( 0 )  -- set nonblocking
-               if localaddr then
-                       local res, err = client:bind( localaddr, localport, -1 )
-                       if not res then
-                               debug( "cannot bind client:", err )
-                               return nil, err
-                       end
-               end
-               local sslctx
-               if sslcfg then  -- handle ssl/new context
-                       if not has_luasec then
-                               debug "need luasec, but not available"
-                               return nil, "luasec not found"
-                       end
-                       sslctx, err = sslcfg
-                       if err then
-                               debug( "cannot create new ssl context:", err )
-                               return nil, err
-                       end
-               end
                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, startssl )
+                       local interface = wrapclient( client, ip, serverport, listener, pattern, sslctx )
                        interface:_start_connection( startssl )
                        debug( "new connection id:", interface.id )
                        return interface, err