Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2015-09-17 18:21:44 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-12-17 08:58:51 (GMT) |
| commit | 9bce26254aa3c2feffdd751b59cdee5e903fd2bc (patch) | |
| tree | 27bf31b4564216db6bf74818dc76f0ba23af074e /Swiften/Network/BoostNetworkFactories.cpp | |
| parent | bea3559998c0ae0a2afca566046f08d0a201c0b2 (diff) | |
| download | swift-9bce26254aa3c2feffdd751b59cdee5e903fd2bc.zip swift-9bce26254aa3c2feffdd751b59cdee5e903fd2bc.tar.bz2 | |
Add event loop for integration in Boost ASIO
This allows execution of events inside an existing io_service
if an application is already using Boost ASIO for other things
and can share the io_service.
Test-Information:
Builds on OS X 10.11.2.
Change-Id: I092ed7a25b24ef95d4664bae98ed84cc0f149073
Diffstat (limited to 'Swiften/Network/BoostNetworkFactories.cpp')
| -rw-r--r-- | Swiften/Network/BoostNetworkFactories.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Swiften/Network/BoostNetworkFactories.cpp b/Swiften/Network/BoostNetworkFactories.cpp index 4ab42d9..871a38b 100644 --- a/Swiften/Network/BoostNetworkFactories.cpp +++ b/Swiften/Network/BoostNetworkFactories.cpp @@ -1,37 +1,37 @@ /* - * Copyright (c) 2010-2013 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/Network/BoostNetworkFactories.h> -#include <Swiften/Network/BoostTimerFactory.h> -#include <Swiften/Network/BoostConnectionFactory.h> +#include <Swiften/Crypto/CryptoProvider.h> +#include <Swiften/Crypto/PlatformCryptoProvider.h> +#include <Swiften/IDN/IDNConverter.h> +#include <Swiften/IDN/PlatformIDNConverter.h> +#include <Swiften/Network/BoostConnectionFactory.h> #include <Swiften/Network/BoostConnectionServerFactory.h> -#include <Swiften/Network/PlatformNATTraversalWorker.h> -#include <Swiften/Parser/PlatformXMLParserFactory.h> +#include <Swiften/Network/BoostTimerFactory.h> #include <Swiften/Network/NullNATTraverser.h> +#include <Swiften/Network/PlatformNATTraversalWorker.h> #include <Swiften/Network/PlatformNetworkEnvironment.h> -#include <Swiften/TLS/PlatformTLSFactories.h> #include <Swiften/Network/PlatformProxyProvider.h> -#include <Swiften/IDN/PlatformIDNConverter.h> -#include <Swiften/IDN/IDNConverter.h> -#include <Swiften/Crypto/PlatformCryptoProvider.h> -#include <Swiften/Crypto/CryptoProvider.h> +#include <Swiften/Parser/PlatformXMLParserFactory.h> +#include <Swiften/TLS/PlatformTLSFactories.h> #ifdef USE_UNBOUND #include <Swiften/Network/UnboundDomainNameResolver.h> #else #include <Swiften/Network/PlatformDomainNameResolver.h> #endif namespace Swift { -BoostNetworkFactories::BoostNetworkFactories(EventLoop* eventLoop) : eventLoop(eventLoop){ +BoostNetworkFactories::BoostNetworkFactories(EventLoop* eventLoop, boost::shared_ptr<boost::asio::io_service> ioService) : ioServiceThread(ioService), eventLoop(eventLoop) { timerFactory = new BoostTimerFactory(ioServiceThread.getIOService(), eventLoop); connectionFactory = new BoostConnectionFactory(ioServiceThread.getIOService(), eventLoop); connectionServerFactory = new BoostConnectionServerFactory(ioServiceThread.getIOService(), eventLoop); #ifdef SWIFT_EXPERIMENTAL_FT natTraverser = new PlatformNATTraversalWorker(eventLoop); #else |