Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2018-07-28 11:45:35 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2018-07-30 13:27:15 (GMT) |
| commit | 798f8ec3331043a92f6ca3bc810b9477c3f8261e (patch) | |
| tree | 868bde2ddcbad1a66d4256edd6050f486860eb2b /Swiften/Network/TLSConnection.cpp | |
| parent | 48596613cfe0f45c0916beabbcc3a27e01752c4b (diff) | |
| download | swift-798f8ec3331043a92f6ca3bc810b9477c3f8261e.zip swift-798f8ec3331043a92f6ca3bc810b9477c3f8261e.tar.bz2 | |
Use std::unique_ptr to have TLS classes own the TLSContext
TLSLayer and TLSConnection now own the TLSContext they use.
The TLSContextFactory interface is adjusted to use
std::unique_ptr.
Test-Information:
Builds and all tests pass on macOS with clang-7-master.
Change-Id: I14e33c98b48445094f404b73ea41af0a51d2dde6
Diffstat (limited to 'Swiften/Network/TLSConnection.cpp')
| -rw-r--r-- | Swiften/Network/TLSConnection.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Swiften/Network/TLSConnection.cpp b/Swiften/Network/TLSConnection.cpp index 7c293d1..82bf114 100644 --- a/Swiften/Network/TLSConnection.cpp +++ b/Swiften/Network/TLSConnection.cpp @@ -1,8 +1,8 @@ /* - * Copyright (c) 2011-2016 Isode Limited. + * Copyright (c) 2011-2018 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/Network/TLSConnection.h> @@ -29,13 +29,12 @@ TLSConnection::TLSConnection(Connection::ref connection, TLSContextFactory* tlsF TLSConnection::~TLSConnection() { connection->onConnectFinished.disconnect(boost::bind(&TLSConnection::handleRawConnectFinished, this, _1)); connection->onDataRead.disconnect(boost::bind(&TLSConnection::handleRawDataRead, this, _1)); connection->onDataWritten.disconnect(boost::bind(&TLSConnection::handleRawDataWritten, this)); connection->onDisconnected.disconnect(boost::bind(&TLSConnection::handleRawDisconnected, this, _1)); - delete context; } void TLSConnection::handleTLSConnectFinished(bool error) { onConnectFinished(error); if (error) { disconnect(); @@ -68,13 +67,13 @@ HostAddressPort TLSConnection::getLocalAddress() const { HostAddressPort TLSConnection::getRemoteAddress() const { return connection->getRemoteAddress(); } TLSContext* TLSConnection::getTLSContext() const { - return context; + return context.get(); } void TLSConnection::handleRawConnectFinished(bool error) { connection->onConnectFinished.disconnect(boost::bind(&TLSConnection::handleRawConnectFinished, this, _1)); if (error) { onConnectFinished(true); |