diff options
Diffstat (limited to 'Swiften/StreamStack/TLSLayer.h')
-rw-r--r-- | Swiften/StreamStack/TLSLayer.h | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/Swiften/StreamStack/TLSLayer.h b/Swiften/StreamStack/TLSLayer.h index 0ab35d5..415a3f0 100644 --- a/Swiften/StreamStack/TLSLayer.h +++ b/Swiften/StreamStack/TLSLayer.h @@ -1,14 +1,15 @@ /* - * Copyright (c) 2010-2015 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once +#include <boost/signals2.hpp> + #include <Swiften/Base/API.h> #include <Swiften/Base/SafeByteArray.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/StreamStack/StreamLayer.h> #include <Swiften/TLS/Certificate.h> #include <Swiften/TLS/CertificateVerificationError.h> @@ -17,33 +18,33 @@ #include <Swiften/TLS/TLSOptions.h> namespace Swift { - class TLSContext; - class TLSContextFactory; + class TLSContext; + class TLSContextFactory; - class SWIFTEN_API TLSLayer : public StreamLayer { - public: - TLSLayer(TLSContextFactory*, const TLSOptions&); - virtual ~TLSLayer(); + class SWIFTEN_API TLSLayer : public StreamLayer { + public: + TLSLayer(TLSContextFactory*, const TLSOptions&); + virtual ~TLSLayer(); - void connect(); - bool setClientCertificate(CertificateWithKey::ref cert); + void connect(); + bool setClientCertificate(CertificateWithKey::ref cert); - Certificate::ref getPeerCertificate() const; - std::vector<Certificate::ref> getPeerCertificateChain() const; - boost::shared_ptr<CertificateVerificationError> getPeerCertificateVerificationError() const; + Certificate::ref getPeerCertificate() const; + std::vector<Certificate::ref> getPeerCertificateChain() const; + std::shared_ptr<CertificateVerificationError> getPeerCertificateVerificationError() const; - void writeData(const SafeByteArray& data); - void handleDataRead(const SafeByteArray& data); + void writeData(const SafeByteArray& data); + void handleDataRead(const SafeByteArray& data); - TLSContext* getContext() const { - return context; - } + TLSContext* getContext() const { + return context; + } - public: - boost::signal<void (boost::shared_ptr<TLSError>)> onError; - boost::signal<void ()> onConnected; + public: + boost::signals2::signal<void (std::shared_ptr<TLSError>)> onError; + boost::signals2::signal<void ()> onConnected; - private: - TLSContext* context; - }; + private: + TLSContext* context; + }; } |