MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-29 02:02:38 +01:00
Code Issues Releases Wiki Activity

ircd::net: Remove impossible log conditional; minor cleanup.

Browse source
This commit is contained in:
Jason Volk 2018-01-11 03:22:17 -08:00
parent b0acc95559
commit fcfa386e33
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ircd/net.cc
View file

@ -561,7 +561,7 @@ ircd::net::linger(socket &socket,
assert(t <= std::numeric_limits<int>::max()); assert(t <= std::numeric_limits<int>::max());
ip::tcp::socket::linger option ip::tcp::socket::linger option
{ {
t >= 0, // ON / OFF boolean t >= 0, // ON / OFF boolean
t >= 0? int(t) : 0 // Uses 0 when OFF t >= 0? int(t) : 0 // Uses 0 when OFF
}; };
@ -958,10 +958,9 @@ catch(const ctx::interrupted &e)
} }
catch(const std::exception &e) catch(const std::exception &e)
{ {
log.error("%s: socket(%p): in accept(): [%s]: %s", log.error("%s: socket(%p): in accept(): %s",
std::string(*this), std::string(*this),
sock.get(), sock.get(),
connected(*sock)? string(sock->remote()) : "<gone>",
e.what()); e.what());
} }
@ -1031,10 +1030,9 @@ catch(const ctx::interrupted &e)
} }
catch(const std::exception &e) catch(const std::exception &e)
{ {
log.error("%s: socket(%p): in handshake(): [%s]: %s", log.error("%s: socket(%p): in handshake(): %s",
std::string(*this), std::string(*this),
sock.get(), sock.get(),
connected(*sock)? string(sock->remote()) : "<gone>",
e.what()); e.what());
} }
@ -1072,18 +1070,19 @@ ircd::net::listener::acceptor::configure(const json::object &opts)
{ {
log.debug("%s preparing listener socket configuration...", log.debug("%s preparing listener socket configuration...",
std::string(*this)); std::string(*this));
/*
ssl.set_options ssl.set_options
( (
//ssl.default_workarounds 0
//| ssl.default_workarounds
//| ssl.no_tlsv1 //| ssl.no_tlsv1
//| ssl.no_tlsv1_1 //| ssl.no_tlsv1_1
//| ssl.no_tlsv1_2 //| ssl.no_tlsv1_2
//| ssl.no_sslv2 //| ssl.no_sslv2
//| ssl.no_sslv3 //| ssl.no_sslv3
//ssl.single_dh_use //| ssl.single_dh_use
); );
*/
//TODO: XXX //TODO: XXX
ssl.set_password_callback([this] ssl.set_password_callback([this]
(const auto &size, const auto &purpose) (const auto &size, const auto &purpose)