MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-25 08:12:37 +01:00
Code Issues Releases Wiki Activity

ircd::net: Better to not invoke the callback in these places.

Browse source
This commit is contained in:
Jason Volk 2018-01-20 07:01:14 -08:00
parent 103ff45553
commit ac77dfd4f0
1 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
ircd/net.cc
View file

@ -1072,9 +1072,6 @@ ircd::net::listener::acceptor::check_handshake_error(const error_code &ec,
if(ec.category() == system_category()) switch(ec.value())
{
case operation_canceled:
break;
default:
break;
}
@ -1558,7 +1555,6 @@ catch(const std::bad_weak_ptr &e)
e.what());
assert(0);
call_user(callback, ec);
}
catch(const std::exception &e)
{
@ -1579,27 +1575,27 @@ noexcept try
using namespace boost::system::errc;
using boost::system::system_category;
if(unlikely(wp.expired()))
return;
switch(ec.value())
{
// A 'success' for this handler means there was a timeout on the socket
case success: if(likely(!wp.expired()))
case success:
{
assert(timedout == false);
timedout = true;
ec = { timed_out, system_category() };
sd.cancel();
break;
}
else break;
// A cancelation means there was no timeout.
case operation_canceled: if(likely(!wp.expired()))
case operation_canceled:
{
assert(ec.category() == system_category());
assert(timedout == false);
break;
}
else break;
// All other errors are unexpected, logged and ignored here.
default:
@ -1620,6 +1616,7 @@ catch(const std::exception &e)
log.critical("socket(%p) handle timeout: %s",
(const void *)this,
e.what());
assert(0);
if(callback)
call_user(callback, ec);
@ -1668,15 +1665,6 @@ noexcept try
handshake(opts, std::move(callback));
}
catch(const std::bad_weak_ptr &e)
{
log.warning("socket(%p) belated callback to handle_connect... (%s)",
this,
e.what());
assert(0);
call_user(callback, ec);
}
catch(const boost::system::system_error &e)
{
log.error("socket(%p) after connect: %s",
@ -1686,6 +1674,14 @@ catch(const boost::system::system_error &e)
assert(0);
call_user(callback, e.code());
}
catch(const std::bad_weak_ptr &e)
{
log.warning("socket(%p) belated callback to handle_connect... (%s)",
this,
e.what());
assert(0);
}
catch(const std::exception &e)
{
log.critical("socket(%p) handle_connect: %s",
@ -1787,14 +1783,15 @@ catch(const std::bad_weak_ptr &e)
log.warning("socket(%p) belated callback to handle_handshake... (%s)",
this,
e.what());
assert(0);
call_user(callback, ec);
}
catch(const std::exception &e)
{
log.critical("socket(%p) handle_handshake: %s",
this,
e.what());
assert(0);
call_user(callback, ec);
}