diff options
Diffstat (limited to 'Swiften/Component/CoreComponent.cpp')
| -rw-r--r-- | Swiften/Component/CoreComponent.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Swiften/Component/CoreComponent.cpp b/Swiften/Component/CoreComponent.cpp index 23b7759..358b0c6 100644 --- a/Swiften/Component/CoreComponent.cpp +++ b/Swiften/Component/CoreComponent.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2013 Isode Limited. | 2 | * Copyright (c) 2010-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -9,14 +9,16 @@ | |||
| 9 | #include <boost/bind.hpp> | 9 | #include <boost/bind.hpp> |
| 10 | #include <iostream> | 10 | #include <iostream> |
| 11 | 11 | ||
| 12 | #include <Swiften/Base/IDGenerator.h> | ||
| 12 | #include <Swiften/Component/ComponentSession.h> | 13 | #include <Swiften/Component/ComponentSession.h> |
| 14 | #include <Swiften/Component/ComponentSessionStanzaChannel.h> | ||
| 13 | #include <Swiften/Network/Connector.h> | 15 | #include <Swiften/Network/Connector.h> |
| 14 | #include <Swiften/Network/NetworkFactories.h> | 16 | #include <Swiften/Network/NetworkFactories.h> |
| 15 | #include <Swiften/TLS/PKCS12Certificate.h> | ||
| 16 | #include <Swiften/Session/BasicSessionStream.h> | ||
| 17 | #include <Swiften/Queries/IQRouter.h> | 17 | #include <Swiften/Queries/IQRouter.h> |
| 18 | #include <Swiften/Base/IDGenerator.h> | 18 | #include <Swiften/Session/BasicSessionStream.h> |
| 19 | #include <Swiften/Component/ComponentSessionStanzaChannel.h> | 19 | #include <Swiften/TLS/PKCS12Certificate.h> |
| 20 | #include <Swiften/TLS/TLSOptions.h> | ||
| 21 | |||
| 20 | 22 | ||
| 21 | namespace Swift { | 23 | namespace Swift { |
| 22 | 24 | ||
| @@ -63,7 +65,7 @@ void CoreComponent::handleConnectorFinished(boost::shared_ptr<Connection> connec | |||
| 63 | connection_ = connection; | 65 | connection_ = connection; |
| 64 | 66 | ||
| 65 | assert(!sessionStream_); | 67 | assert(!sessionStream_); |
| 66 | sessionStream_ = boost::shared_ptr<BasicSessionStream>(new BasicSessionStream(ComponentStreamType, connection_, getPayloadParserFactories(), getPayloadSerializers(), NULL, networkFactories->getTimerFactory(), networkFactories->getXMLParserFactory())); | 68 | sessionStream_ = boost::shared_ptr<BasicSessionStream>(new BasicSessionStream(ComponentStreamType, connection_, getPayloadParserFactories(), getPayloadSerializers(), NULL, networkFactories->getTimerFactory(), networkFactories->getXMLParserFactory(), TLSOptions())); |
| 67 | sessionStream_->onDataRead.connect(boost::bind(&CoreComponent::handleDataRead, this, _1)); | 69 | sessionStream_->onDataRead.connect(boost::bind(&CoreComponent::handleDataRead, this, _1)); |
| 68 | sessionStream_->onDataWritten.connect(boost::bind(&CoreComponent::handleDataWritten, this, _1)); | 70 | sessionStream_->onDataWritten.connect(boost::bind(&CoreComponent::handleDataWritten, this, _1)); |
| 69 | 71 | ||
Swift