Software / code / prosody
Changeset
7598:335b5ce06062
net.server_epoll: TLS handshake timeout
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 18 Aug 2016 17:07:14 +0200 |
| parents | 7597:cd34aa6b1632 |
| children | 7599:afbda0bd9cfc |
| files | net/server_epoll.lua |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/net/server_epoll.lua Thu Aug 18 16:59:31 2016 +0200 +++ b/net/server_epoll.lua Thu Aug 18 17:07:14 2016 +0200 @@ -30,6 +30,7 @@ tcp_backlog = 128; accept_retry_interval = 10; read_retry_delay = 1e-06; + handshake_timeout = 60; }; local fds = createtable(10, 0); -- FD -> conn @@ -385,10 +386,13 @@ self.onwriteable = interface.tlshandskake; self.onreadable = interface.tlshandskake; self:setflags(true, true); + self:setwritetimeout(cfg.handshake_timeout); end end function interface:tlshandskake() + self:setwritetimeout(false); + self:setreadtimeout(false); local ok, err = self.conn:dohandshake(); if ok then log("debug", "TLS handshake on %s complete", tostring(self)); @@ -406,12 +410,10 @@ elseif err == "wantread" then log("debug", "TLS handshake on %s to wait until readable", tostring(self)); self:setflags(true, false); - self:setwritetimeout(false); self:setreadtimeout(cfg.handshake_timeout); elseif err == "wantwrite" then log("debug", "TLS handshake on %s to wait until writable", tostring(self)); self:setflags(false, true); - self:setreadtimeout(false); self:setwritetimeout(cfg.handshake_timeout); else log("debug", "TLS handshake error on %s: %s", tostring(self), err);
