diff options
| author | daurnimator <quae@daurnimator.com> | 2013-12-18 17:52:28 -0500 |
|---|---|---|
| committer | daurnimator <quae@daurnimator.com> | 2013-12-18 17:52:28 -0500 |
| commit | a0bb667fee2d4407b2da4380bc89e949e5f632a2 (patch) | |
| tree | bd7ec10b22f1611ab21de1d1b2bf2c5a747705e7 | |
| parent | 1bdf48e7d2bb8cc29d9b2d11c004a4b7e6f82515 (diff) | |
| download | prosody-a0bb667fee2d4407b2da4380bc89e949e5f632a2.tar.gz prosody-a0bb667fee2d4407b2da4380bc89e949e5f632a2.zip | |
net/server_event: add_client should have same arguments no-matter the server backend
| -rw-r--r-- | net/server_event.lua | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index 59217a0c..82accc99 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -744,36 +744,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 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 |