MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2025-01-13 08:23:56 +01:00
Code Issues Releases Wiki Activity

ircd::net: Recondition socket handlers to not cancel socket timer.

Browse source
This commit is contained in:
Jason Volk 2018-03-10 12:52:23 -08:00
parent 00ba8ebdb4
commit 9f7aa315fa
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ircd/net.cc
View file

@ -1546,9 +1546,10 @@ noexcept try
// After life_guard is constructed it is safe to use *this in this frame.
const life_guard<socket> s{wp};
if(!timedout)
if(!timedout && ec != operation_canceled)
cancel_timeout();
else if(ec == operation_canceled && ec.category() == system_category())
if(timedout && ec == operation_canceled && ec.category() == system_category())
ec = { timed_out, system_category() };
if(unlikely(!ec && !sd.is_open()))
@ -1666,9 +1667,10 @@ noexcept try
string(ec));
// The timer was set by socket::connect() and may need to be canceled.
if(!timedout)
if(!timedout && ec != operation_canceled)
cancel_timeout();
else if(ec == operation_canceled && ec.category() == system_category())
if(timedout && ec == operation_canceled && ec.category() == system_category())
ec = { timed_out, system_category() };
// A connect error; abort here by calling the user back with error.
@ -1725,9 +1727,10 @@ noexcept try
using namespace boost::system::errc;
using boost::system::system_category;
if(!timedout)
if(!timedout && ec != operation_canceled)
cancel_timeout();
else if(ec == operation_canceled && ec.category() == system_category())
if(timedout && ec == operation_canceled && ec.category() == system_category())
ec = { timed_out, system_category() };
log.debug("socket(%p) local[%s] remote[%s] disconnect %s",
@ -1774,9 +1777,10 @@ noexcept try
const life_guard<socket> s{wp};
if(!timedout)
if(!timedout && ec != operation_canceled)
cancel_timeout();
else if(ec == operation_canceled && ec.category() == system_category())
if(timedout && ec == operation_canceled && ec.category() == system_category())
ec = { timed_out, system_category() };
log.debug("socket(%p) local[%s] remote[%s] handshake %s",