diff options
| author | louiz’ <louiz@louiz.org> | 2018-04-28 14:17:43 +0200 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2018-04-28 14:17:43 +0200 |
| commit | efa63ee5cb4be3aebc1489dc9db936eea26660d4 (patch) | |
| tree | bc8ac3d71e01738aad00d1a91ab35a75ad90d6c6 /src | |
| parent | 1236b8a03bee403fcaa59d882d8e7fb9058b2280 (diff) | |
| parent | d887baa064318fdb350fb6c3f7b8e2104a644fcb (diff) | |
| download | biboumi-efa63ee5cb4be3aebc1489dc9db936eea26660d4.tar.gz biboumi-efa63ee5cb4be3aebc1489dc9db936eea26660d4.tar.bz2 biboumi-efa63ee5cb4be3aebc1489dc9db936eea26660d4.tar.xz biboumi-efa63ee5cb4be3aebc1489dc9db936eea26660d4.zip | |
Merge branch 'v7'
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/tcp_client_socket_handler.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/network/tcp_client_socket_handler.cpp b/src/network/tcp_client_socket_handler.cpp index aac13d0..9dda73d 100644 --- a/src/network/tcp_client_socket_handler.cpp +++ b/src/network/tcp_client_socket_handler.cpp @@ -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 |