diff options
Diffstat (limited to 'Swiften/Client/CoreClient.cpp')
| -rw-r--r-- | Swiften/Client/CoreClient.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Swiften/Client/CoreClient.cpp b/Swiften/Client/CoreClient.cpp index 842488d..c91e5c5 100644 --- a/Swiften/Client/CoreClient.cpp +++ b/Swiften/Client/CoreClient.cpp | |||
| @@ -138,7 +138,8 @@ void CoreClient::connect(const ClientOptions& o) { | |||
| 138 | host, | 138 | host, |
| 139 | options.boshHTTPConnectProxyURL, | 139 | options.boshHTTPConnectProxyURL, |
| 140 | options.boshHTTPConnectProxyAuthID, | 140 | options.boshHTTPConnectProxyAuthID, |
| 141 | options.boshHTTPConnectProxyAuthPassword)); | 141 | options.boshHTTPConnectProxyAuthPassword, |
| 142 | options.tlsOptions)); | ||
| 142 | sessionStream_->onDataRead.connect(boost::bind(&CoreClient::handleDataRead, this, _1)); | 143 | sessionStream_->onDataRead.connect(boost::bind(&CoreClient::handleDataRead, this, _1)); |
| 143 | sessionStream_->onDataWritten.connect(boost::bind(&CoreClient::handleDataWritten, this, _1)); | 144 | sessionStream_->onDataWritten.connect(boost::bind(&CoreClient::handleDataWritten, this, _1)); |
| 144 | bindSessionToStream(); | 145 | bindSessionToStream(); |
| @@ -189,7 +190,7 @@ void CoreClient::handleConnectorFinished(boost::shared_ptr<Connection> connectio | |||
| 189 | connection_ = connection; | 190 | connection_ = connection; |
| 190 | 191 | ||
| 191 | assert(!sessionStream_); | 192 | assert(!sessionStream_); |
| 192 | sessionStream_ = boost::make_shared<BasicSessionStream>(ClientStreamType, connection_, getPayloadParserFactories(), getPayloadSerializers(), networkFactories->getTLSContextFactory(), networkFactories->getTimerFactory(), networkFactories->getXMLParserFactory()); | 193 | sessionStream_ = boost::make_shared<BasicSessionStream>(ClientStreamType, connection_, getPayloadParserFactories(), getPayloadSerializers(), networkFactories->getTLSContextFactory(), networkFactories->getTimerFactory(), networkFactories->getXMLParserFactory(), options.tlsOptions); |
| 193 | if (certificate_ && !certificate_->isNull()) { | 194 | if (certificate_ && !certificate_->isNull()) { |
| 194 | sessionStream_->setTLSCertificate(certificate_); | 195 | sessionStream_->setTLSCertificate(certificate_); |
| 195 | } | 196 | } |
Swift