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: Separate handling of new incoming and outgoing connections

Browse source 
The :init method is more suited for new outgoing connections, which is
why it uses the connect_timeout setting.

Depending on whether a newly accepted connection is to a Direct TLS port
or not, it should be handled differently, and was already. The :starttls
method sets up timeouts on its own, so the one set in :init was not needed.

Newly accepted plain TCP connections don't need a write timeout set, a
read timeout is enough.
This commit is contained in:
Kim Alvefur 2021-07-08 17:52:59 +02:00
parent 532fbe0687
commit 852e44959d
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
net/server_epoll.lua
View file

@ -562,6 +562,8 @@ function interface:starttls(tls_ctx)
self.onwritable = interface.tlshandshake;
self.onreadable = interface.tlshandshake;
self:set(true, true);
self:setreadtimeout(cfg.ssl_handshake_timeout);
self:setwritetimeout(cfg.ssl_handshake_timeout);
self:debug("Prepared to start TLS");
end
end
@ -691,15 +693,17 @@ function interface:onacceptable()
end
local client = wrapsocket(conn, self, nil, self.listeners);
client:debug("New connection %s on server %s", client, self);
client:init();
if self.tls_direct then
client:add(true, true);
client:starttls(self.tls_ctx);
else
client:add(true, false);
client:setreadtimeout();
client:onconnect();
end
end
-- Initialization
-- Initialization for outgoing connections
function interface:init()
self:setwritetimeout(cfg.connect_timeout);
return self:add(true, true);