mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

net.server_epoll: Refactor immediate TLS handshake start

Browse source
This commit is contained in:
Kim Alvefur 2021-07-13 14:55:21 +02:00
parent 123a7b7079
commit 1877068b3d
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
net/server_epoll.lua
View file

@ -570,7 +570,7 @@ function interface:starttls(tls_ctx)
end
end
function interface:inittls(tls_ctx)
function interface:inittls(tls_ctx, now)
if self._tls then return end
if tls_ctx then self.tls_ctx = tls_ctx; end
self._tls = true;
@ -612,6 +612,9 @@ function interface:inittls(tls_ctx)
self.ondrain = nil;
self.onwritable = interface.tlshandshake;
self.onreadable = interface.tlshandshake;
if now then
return self:tlshandshake()
end
self:setreadtimeout(cfg.ssl_handshake_timeout);
self:setwritetimeout(cfg.ssl_handshake_timeout);
self:set(true, true);
@ -701,11 +704,7 @@ function interface:onacceptable()
client:debug("New connection %s on server %s", client, self);
if self.tls_direct then
client:add(true, true);
if client:inittls(self.tls_ctx) then
client:setreadtimeout(cfg.ssl_handshake_timeout);
client:setwritetimeout(cfg.ssl_handshake_timeout);
client:tlshandshake();
end
client:inittls(self.tls_ctx, true);
else
client:add(true, false);
client:onconnect();