net/server_event: add_client should have same arguments no-matter the server backend
authordaurnimator <quae@daurnimator.com>
Wed, 18 Dec 2013 17:52:28 -0500
changeset 5958 451b4649fad2
parent 5957 3c5061d937dd
child 5959 9e3b15199ec5
net/server_event: add_client should have same arguments no-matter the server backend
net/server_event.lua
--- a/net/server_event.lua	Wed Dec 18 17:51:27 2013 -0500
+++ b/net/server_event.lua	Wed Dec 18 17:52:28 2013 -0500
@@ -744,36 +744,21 @@
 		--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 ssl 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