Commit efa63ee5 authored by louiz’'s avatar louiz’

Merge branch 'v7'

parents 1236b8a0 d887baa0
Pipeline #1248 passed with stages
in 12 minutes and 50 seconds
......@@ -20,6 +20,12 @@ Version 8.0
the user force a nickname whenever a channel on the server is joined.
- Multiple admins can now be listed in the admin field, separated with a colon.
Version 7.3
===========
- Fix an uncaught exception with botan, when policy does not allow any
available ciphersuite.
Version 7.2 - 2018-01-24
========================
......
......@@ -146,15 +146,22 @@ void TCPClientSocketHandler::connect(const std::string& address, const std::stri
|| errno == EISCONN)
{
log_info("Connection success.");
#ifdef BOTAN_FOUND
if (this->use_tls)
try {
this->start_tls(this->address, this->port);
} catch (const Botan::Exception& e)
{
this->on_connection_failed("TLS error: "s + e.what());
this->close();
return ;
}
#endif
TimedEventsManager::instance().cancel("connection_timeout" +
std::to_string(this->socket));
this->poller->add_socket_handler(this);
this->connected = true;
this->connecting = false;
#ifdef BOTAN_FOUND
if (this->use_tls)
this->start_tls(this->address, this->port);
#endif
this->connection_date = std::chrono::system_clock::now();
// Get our local TCP port and store it
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment