aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/server.lua16
-rw-r--r--net/xmppclient_listener.lua2
2 files changed, 5 insertions, 13 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 )
diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index fe6ec57b..22af2de4 100644
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -113,7 +113,7 @@ function xmppclient.listener(conn, data)
if not session then
session = sm_new_session(conn);
sessions[conn] = session;
-
+
-- Logging functions --
local mainlog, log = log;