MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 07:23:53 +01:00
Code Issues Releases Wiki Activity

ircd::net: Use socket fini state to condition automatic close on open error.

Browse source
This commit is contained in:
Jason Volk 2018-03-10 13:42:55 -08:00
parent 9f7aa315fa
commit 94716e5ea7
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ircd/net.cc
View file

@ -498,7 +498,7 @@ ircd::net::open(socket &socket,
auto complete{[s(shared_from(socket)), handler(std::move(handler))]
(std::exception_ptr eptr)
{
if(eptr)
if(eptr && !s->fini)
close(*s, dc::RST);
handler(std::move(eptr));
@ -1546,7 +1546,7 @@ noexcept try
// After life_guard is constructed it is safe to use *this in this frame.
const life_guard<socket> s{wp};
if(!timedout && ec != operation_canceled)
if(!timedout && ec != operation_canceled && !fini)
cancel_timeout();
if(timedout && ec == operation_canceled && ec.category() == system_category())
@ -1667,7 +1667,7 @@ noexcept try
string(ec));
// The timer was set by socket::connect() and may need to be canceled.
if(!timedout && ec != operation_canceled)
if(!timedout && ec != operation_canceled && !fini)
cancel_timeout();
if(timedout && ec == operation_canceled && ec.category() == system_category())
@ -1727,6 +1727,7 @@ noexcept try
using namespace boost::system::errc;
using boost::system::system_category;
assert(fini);
if(!timedout && ec != operation_canceled)
cancel_timeout();
@ -1777,7 +1778,7 @@ noexcept try
const life_guard<socket> s{wp};
if(!timedout && ec != operation_canceled)
if(!timedout && ec != operation_canceled && !fini)
cancel_timeout();
if(timedout && ec == operation_canceled && ec.category() == system_category())