1 files changed, 22 insertions, 17 deletions
diff --git a/Swiften/Client/CoreClient.cpp b/Swiften/Client/CoreClient.cpp
index af64577..6fc491c 100644
--- a/Swiften/Client/CoreClient.cpp
+++ b/Swiften/Client/CoreClient.cpp
@@ -124,25 +124,30 @@ void CoreClient::connect(const ClientOptions& o) {
 		/* Autodiscovery of which proxy works is largely ok with a TCP session, because this is a one-off. With BOSH
 		 * it would be quite painful given that potentially every stanza could be sent on a new connection.
 		 */
-		//sessionStream_ = boost::make_shared<BOSHSessionStream>(boost::make_shared<BOSHConnectionFactory>(options.boshURL, networkFactories->getConnectionFactory(), networkFactories->getXMLParserFactory(), networkFactories->getTLSContextFactory()), getPayloadParserFactories(), getPayloadSerializers(), networkFactories->getTLSContextFactory(), networkFactories->getTimerFactory(), networkFactories->getXMLParserFactory(), networkFactories->getEventLoop(), host, options.boshHTTPConnectProxyURL, options.boshHTTPConnectProxyAuthID, options.boshHTTPConnectProxyAuthPassword);
-		sessionStream_ = boost::shared_ptr<BOSHSessionStream>(new BOSHSessionStream(
-				options.boshURL,
-				getPayloadParserFactories(),
-				getPayloadSerializers(),
-				networkFactories->getConnectionFactory(),
-				networkFactories->getTLSContextFactory(),
-				networkFactories->getTimerFactory(),
-				networkFactories->getXMLParserFactory(),
-				networkFactories->getEventLoop(),
-				networkFactories->getDomainNameResolver(),
-				host,
-				options.boshHTTPConnectProxyURL,
-				options.boshHTTPConnectProxyAuthID,
-				options.boshHTTPConnectProxyAuthPassword,
-				options.tlsOptions,
-				options.httpTrafficFilter));
+		boost::shared_ptr<BOSHSessionStream> boshSessionStream_ = boost::shared_ptr<BOSHSessionStream>(new BOSHSessionStream(
+			options.boshURL,
+			getPayloadParserFactories(),
+			getPayloadSerializers(),
+			networkFactories->getConnectionFactory(),
+			networkFactories->getTLSContextFactory(),
+			networkFactories->getTimerFactory(),
+			networkFactories->getXMLParserFactory(),
+			networkFactories->getEventLoop(),
+			networkFactories->getDomainNameResolver(),
+			host,
+			options.boshHTTPConnectProxyURL,
+			options.boshHTTPConnectProxyAuthID,
+			options.boshHTTPConnectProxyAuthPassword,
+			options.tlsOptions,
+			options.httpTrafficFilter));
+		sessionStream_ = boshSessionStream_;
 		sessionStream_->onDataRead.connect(boost::bind(&CoreClient::handleDataRead, this, _1));
 		sessionStream_->onDataWritten.connect(boost::bind(&CoreClient::handleDataWritten, this, _1));
+		if (certificate_ && !certificate_->isNull()) {
+			SWIFT_LOG(debug) << "set certificate" << std::endl;
+			sessionStream_->setTLSCertificate(certificate_);
+		}
+		boshSessionStream_->open();
 		bindSessionToStream();
 	}