5 files changed, 68 insertions, 69 deletions
diff --git a/Swiften/StreamStack/StreamStack.cpp b/Swiften/StreamStack/StreamStack.cpp
index 44a018d..cf80fb1 100644
--- a/Swiften/StreamStack/StreamStack.cpp
+++ b/Swiften/StreamStack/StreamStack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,30 +8,30 @@
 
 #include <boost/bind.hpp>
 
+#include <Swiften/StreamStack/HighLayer.h>
 #include <Swiften/StreamStack/LowLayer.h>
 #include <Swiften/StreamStack/StreamLayer.h>
-#include <Swiften/StreamStack/XMPPLayer.h>
 
 namespace Swift {
 
-StreamStack::StreamStack(XMPPLayer* xmppLayer, LowLayer* physicalLayer) : xmppLayer_(xmppLayer), physicalLayer_(physicalLayer) {
-    physicalLayer_->setParentLayer(xmppLayer_);
-    xmppLayer_->setChildLayer(physicalLayer_);
+StreamStack::StreamStack(std::unique_ptr<HighLayer> topLayer, std::unique_ptr<LowLayer> bottomLayer) : topLayer_(std::move(topLayer)), bottomLayer_(std::move(bottomLayer)) {
+    bottomLayer_->setParentLayer(topLayer_.get());
+    topLayer_->setChildLayer(bottomLayer_.get());
 }
 
 StreamStack::~StreamStack() {
 }
 
-void StreamStack::addLayer(StreamLayer* newLayer) {
-    LowLayer* lowLayer = layers_.empty() ? physicalLayer_ : *layers_.rbegin();
+void StreamStack::addLayer(std::unique_ptr<StreamLayer> streamLayer) {
+    auto* lowLayer = layers_.empty() ? bottomLayer_.get() : layers_.rbegin()->get();
 
-    xmppLayer_->setChildLayer(newLayer);
-    newLayer->setParentLayer(xmppLayer_);
+    topLayer_->setChildLayer(streamLayer.get());
+    streamLayer->setParentLayer(topLayer_.get());
 
-    lowLayer->setParentLayer(newLayer);
-    newLayer->setChildLayer(lowLayer);
+    lowLayer->setParentLayer(streamLayer.get());
+    streamLayer->setChildLayer(lowLayer);
 
-    layers_.push_back(newLayer);
+    layers_.emplace_back(std::move(streamLayer));
 }
 
 }
diff --git a/Swiften/StreamStack/StreamStack.h b/Swiften/StreamStack/StreamStack.h
index b12a69f..263b1f5 100644
--- a/Swiften/StreamStack/StreamStack.h
+++ b/Swiften/StreamStack/StreamStack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -15,34 +15,40 @@
 #include <Swiften/Elements/Stanza.h>
 
 namespace Swift {
-    class XMPPLayer;
+    class HighLayer;
     class LowLayer;
     class StreamLayer;
 
     class SWIFTEN_API StreamStack {
         public:
-            StreamStack(XMPPLayer* xmppLayer, LowLayer* physicalLayer);
+            StreamStack(std::unique_ptr<HighLayer> topLayer, std::unique_ptr<LowLayer> bottomLayer);
             ~StreamStack();
 
-            void addLayer(StreamLayer*);
+            void addLayer(std::unique_ptr<StreamLayer> /* streamLayer */);
 
-            XMPPLayer* getXMPPLayer() const {
-                return xmppLayer_;
+            HighLayer* getTopLayer() const {
+                return topLayer_.get();
             }
 
-            template<typename T> T* getLayer() {
-                for (auto& i : layers_) {
-                    T* layer = dynamic_cast<T*>(i);
+            template<typename T> T* getLayer() const {
+                for (const auto& i : layers_) {
+                    T* layer = dynamic_cast<T*>(i.get());
                     if (layer) {
                         return layer;
                     }
                 }
+                if (T* layer = dynamic_cast<T*>(topLayer_.get())) {
+                    return layer;
+                }
+                if (T* layer = dynamic_cast<T*>(bottomLayer_.get())) {
+                    return layer;
+                }
                 return nullptr;
             }
 
         private:
-            XMPPLayer* xmppLayer_;
-            LowLayer* physicalLayer_;
-            std::vector<StreamLayer*> layers_;
+            std::unique_ptr<HighLayer> topLayer_;
+            std::unique_ptr<LowLayer> bottomLayer_;
+            std::vector<std::unique_ptr<StreamLayer>> layers_;
     };
 }
diff --git a/Swiften/StreamStack/TLSLayer.cpp b/Swiften/StreamStack/TLSLayer.cpp
index ced879e..9f84889 100644
--- a/Swiften/StreamStack/TLSLayer.cpp
+++ b/Swiften/StreamStack/TLSLayer.cpp
@@ -1,11 +1,13 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/StreamStack/TLSLayer.h>
 
+#include <memory>
+
 #include <boost/bind.hpp>
 
 #include <Swiften/TLS/TLSContext.h>
@@ -13,44 +15,42 @@
 
 namespace Swift {
 
-TLSLayer::TLSLayer(TLSContextFactory* factory, const TLSOptions& tlsOptions) {
-    context = factory->createTLSContext(tlsOptions);
-    context->onDataForNetwork.connect(boost::bind(&TLSLayer::writeDataToChildLayer, this, _1));
-    context->onDataForApplication.connect(boost::bind(&TLSLayer::writeDataToParentLayer, this, _1));
-    context->onConnected.connect(onConnected);
-    context->onError.connect(onError);
+TLSLayer::TLSLayer(std::unique_ptr<TLSContext> tlsContext) : context_(std::move(tlsContext)) {
+    context_->onDataForNetwork.connect(boost::bind(&TLSLayer::writeDataToChildLayer, this, _1));
+    context_->onDataForApplication.connect(boost::bind(&TLSLayer::writeDataToParentLayer, this, _1));
+    context_->onConnected.connect(onConnected);
+    context_->onError.connect(onError);
 }
 
 TLSLayer::~TLSLayer() {
-    delete context;
 }
 
 void TLSLayer::connect() {
-    context->connect();
+    context_->connect();
 }
 
 void TLSLayer::writeData(const SafeByteArray& data) {
-    context->handleDataFromApplication(data);
+    context_->handleDataFromApplication(data);
 }
 
 void TLSLayer::handleDataRead(const SafeByteArray& data) {
-    context->handleDataFromNetwork(data);
+    context_->handleDataFromNetwork(data);
 }
 
 bool TLSLayer::setClientCertificate(CertificateWithKey::ref certificate) {
-    return context->setClientCertificate(certificate);
+    return context_->setClientCertificate(certificate);
 }
 
 Certificate::ref TLSLayer::getPeerCertificate() const {
-    return context->getPeerCertificate();
+    return context_->getPeerCertificate();
 }
 
 std::vector<Certificate::ref> TLSLayer::getPeerCertificateChain() const {
-    return context->getPeerCertificateChain();
+    return context_->getPeerCertificateChain();
 }
 
 std::shared_ptr<CertificateVerificationError> TLSLayer::getPeerCertificateVerificationError() const {
-    return context->getPeerCertificateVerificationError();
+    return context_->getPeerCertificateVerificationError();
 }
 
 }
diff --git a/Swiften/StreamStack/TLSLayer.h b/Swiften/StreamStack/TLSLayer.h
index 415a3f0..89588e3 100644
--- a/Swiften/StreamStack/TLSLayer.h
+++ b/Swiften/StreamStack/TLSLayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -23,7 +23,7 @@ namespace Swift {
 
     class SWIFTEN_API TLSLayer : public StreamLayer {
         public:
-            TLSLayer(TLSContextFactory*, const TLSOptions&);
+            TLSLayer(std::unique_ptr<TLSContext> tlsContext);
             virtual ~TLSLayer();
 
             void connect();
@@ -37,7 +37,7 @@ namespace Swift {
             void handleDataRead(const SafeByteArray& data);
 
             TLSContext* getContext() const {
-                return context;
+                return context_.get();
             }
 
         public:
@@ -45,6 +45,6 @@ namespace Swift {
             boost::signals2::signal<void ()> onConnected;
 
         private:
-            TLSContext* context;
+            std::unique_ptr<TLSContext> context_;
     };
 }
diff --git a/Swiften/StreamStack/UnitTest/StreamStackTest.cpp b/Swiften/StreamStack/UnitTest/StreamStackTest.cpp
index f0f82c9..b074736 100644
--- a/Swiften/StreamStack/UnitTest/StreamStackTest.cpp
+++ b/Swiften/StreamStack/UnitTest/StreamStackTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -39,19 +39,17 @@ class StreamStackTest : public CppUnit::TestFixture {
 
     public:
         void setUp() {
-            physicalStream_ = new TestLowLayer();
-            xmppStream_ = new XMPPLayer(&parserFactories_, &serializers_, &xmlParserFactory_, ClientStreamType);
+            testling_ = std::make_unique<StreamStack>(std::make_unique<XMPPLayer>(&parserFactories_, &serializers_, &xmlParserFactory_, ClientStreamType), std::make_unique<TestLowLayer>());
+            physicalStream_ = testling_->getLayer<TestLowLayer>();
+            xmppStream_ = testling_->getLayer<XMPPLayer>();
             elementsReceived_ = 0;
             dataWriteReceived_ = 0;
         }
 
         void tearDown() {
-            delete physicalStream_;
-            delete xmppStream_;
         }
 
         void testWriteData_NoIntermediateStreamStack() {
-            StreamStack testling(xmppStream_, physicalStream_);
 
             xmppStream_->writeData("foo");
 
@@ -60,9 +58,8 @@ class StreamStackTest : public CppUnit::TestFixture {
         }
 
         void testWriteData_OneIntermediateStream() {
-            StreamStack testling(xmppStream_, physicalStream_);
-            std::shared_ptr<MyStreamLayer> xStream(new MyStreamLayer("X"));
-            testling.addLayer(xStream.get());
+            std::unique_ptr<MyStreamLayer> xStream(new MyStreamLayer("X"));
+            testling_->addLayer(std::move(xStream));
 
             xmppStream_->writeData("foo");
 
@@ -71,11 +68,10 @@ class StreamStackTest : public CppUnit::TestFixture {
         }
 
         void testWriteData_TwoIntermediateStreamStack() {
-            StreamStack testling(xmppStream_, physicalStream_);
-            std::shared_ptr<MyStreamLayer> xStream(new MyStreamLayer("X"));
-            std::shared_ptr<MyStreamLayer> yStream(new MyStreamLayer("Y"));
-            testling.addLayer(xStream.get());
-            testling.addLayer(yStream.get());
+            std::unique_ptr<MyStreamLayer> xStream(new MyStreamLayer("X"));
+            std::unique_ptr<MyStreamLayer> yStream(new MyStreamLayer("Y"));
+            testling_->addLayer(std::move(xStream));
+            testling_->addLayer(std::move(yStream));
 
             xmppStream_->writeData("foo");
 
@@ -84,7 +80,6 @@ class StreamStackTest : public CppUnit::TestFixture {
         }
 
         void testReadData_NoIntermediateStreamStack() {
-            StreamStack testling(xmppStream_, physicalStream_);
             xmppStream_->onElement.connect(boost::bind(&StreamStackTest::handleElement, this, _1));
 
             physicalStream_->onDataRead(createSafeByteArray("<stream:stream xmlns:stream='http://etherx.jabber.org/streams'><presence/>"));
@@ -93,10 +88,9 @@ class StreamStackTest : public CppUnit::TestFixture {
         }
 
         void testReadData_OneIntermediateStream() {
-            StreamStack testling(xmppStream_, physicalStream_);
             xmppStream_->onElement.connect(boost::bind(&StreamStackTest::handleElement, this, _1));
-            std::shared_ptr<MyStreamLayer> xStream(new MyStreamLayer("<"));
-            testling.addLayer(xStream.get());
+            std::unique_ptr<MyStreamLayer> xStream(new MyStreamLayer("<"));
+            testling_->addLayer(std::move(xStream));
 
             physicalStream_->onDataRead(createSafeByteArray("stream:stream xmlns:stream='http://etherx.jabber.org/streams'><presence/>"));
 
@@ -104,12 +98,11 @@ class StreamStackTest : public CppUnit::TestFixture {
         }
 
         void testReadData_TwoIntermediateStreamStack() {
-            StreamStack testling(xmppStream_, physicalStream_);
             xmppStream_->onElement.connect(boost::bind(&StreamStackTest::handleElement, this, _1));
-            std::shared_ptr<MyStreamLayer> xStream(new MyStreamLayer("s"));
-            std::shared_ptr<MyStreamLayer> yStream(new MyStreamLayer("<"));
-            testling.addLayer(xStream.get());
-            testling.addLayer(yStream.get());
+            std::unique_ptr<MyStreamLayer> xStream(new MyStreamLayer("s"));
+            std::unique_ptr<MyStreamLayer> yStream(new MyStreamLayer("<"));
+            testling_->addLayer(std::move(xStream));
+            testling_->addLayer(std::move(yStream));
 
             physicalStream_->onDataRead(createSafeByteArray("tream:stream xmlns:stream='http://etherx.jabber.org/streams'><presence/>"));
 
@@ -117,10 +110,9 @@ class StreamStackTest : public CppUnit::TestFixture {
         }
 
         void testAddLayer_ExistingOnWriteDataSlot() {
-            StreamStack testling(xmppStream_, physicalStream_);
             xmppStream_->onWriteData.connect(boost::bind(&StreamStackTest::handleWriteData, this, _1));
-            std::shared_ptr<MyStreamLayer> xStream(new MyStreamLayer("X"));
-            testling.addLayer(xStream.get());
+            std::unique_ptr<MyStreamLayer> xStream(new MyStreamLayer("X"));
+            testling_->addLayer(std::move(xStream));
 
             xmppStream_->writeData("foo");
 
@@ -176,6 +168,7 @@ class StreamStackTest : public CppUnit::TestFixture {
         TestLowLayer* physicalStream_;
         PlatformXMLParserFactory xmlParserFactory_;
         XMPPLayer* xmppStream_;
+        std::unique_ptr<StreamStack> testling_;
         int elementsReceived_;
         int dataWriteReceived_;
 };