diff options
Diffstat (limited to 'net/server.lua')
| -rw-r--r-- | net/server.lua | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/net/server.lua b/net/server.lua index d840d51b..9d178cb2 100644 --- a/net/server.lua +++ b/net/server.lua @@ -504,24 +504,13 @@ wraptlsclient = function( listener, socket, ip, serverport, clientport, mode, ss handler.starttls = function (now) if not now then out_put("server.lua: we need to do tls, but delaying until later"); handler.need_tls = true; return; end out_put( "server.lua: attempting to start tls on "..tostring(socket) ) - local oldsocket = socket; socket, err = ssl_wrap( socket, sslctx ) -- wrap socket out_put("sslwrapped socket is "..tostring(socket)); if err then out_put( "server.lua: ssl error: ", err ) return nil, nil, err -- fatal error end - socket:settimeout(0); - - -- Add the new socket to our system - socketlist[ socket ] = handler - readlen = readlen + 1 - readlist[ readlen ] = socket - - -- Remove traces of the old socket - readlen = removesocket( readlist, oldsocket, readlen ) - socketlist [ oldsocket ] = nil; - + socket:settimeout( 1 ) send = socket.send receive = socket.receive close = socket.close @@ -547,6 +536,9 @@ wraptlsclient = function( listener, socket, ip, serverport, clientport, mode, ss handler.receivedata = handler._receivedata -- when handshake is done, replace the handshake function with regular functions handler.dispatchdata = handler._dispatchdata handler.need_tls = nil + socketlist[ client ] = handler + readlen = readlen + 1 + readlist[ readlen ] = client return true; else out_put( "server.lua: error during ssl handshake: ", err ) |