diff options
Diffstat (limited to 'Swiften/Session/BOSHSessionStream.cpp')
| -rw-r--r-- | Swiften/Session/BOSHSessionStream.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Swiften/Session/BOSHSessionStream.cpp b/Swiften/Session/BOSHSessionStream.cpp index eac493e..62942b9 100644 --- a/Swiften/Session/BOSHSessionStream.cpp +++ b/Swiften/Session/BOSHSessionStream.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2011-2014 Isode Limited. | 2 | * Copyright (c) 2011-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 | */ |
| @@ -39,7 +39,8 @@ BOSHSessionStream::BOSHSessionStream( | |||
| 39 | const std::string& to, | 39 | const std::string& to, |
| 40 | const URL& boshHTTPConnectProxyURL, | 40 | const URL& boshHTTPConnectProxyURL, |
| 41 | const SafeString& boshHTTPConnectProxyAuthID, | 41 | const SafeString& boshHTTPConnectProxyAuthID, |
| 42 | const SafeString& boshHTTPConnectProxyAuthPassword) : | 42 | const SafeString& boshHTTPConnectProxyAuthPassword, |
| 43 | const TLSOptions& tlsOptions) : | ||
| 43 | available(false), | 44 | available(false), |
| 44 | eventLoop(eventLoop), | 45 | eventLoop(eventLoop), |
| 45 | firstHeader(true) { | 46 | firstHeader(true) { |
| @@ -49,7 +50,7 @@ BOSHSessionStream::BOSHSessionStream( | |||
| 49 | random.seed(static_cast<unsigned int>(time(NULL))); | 50 | random.seed(static_cast<unsigned int>(time(NULL))); |
| 50 | unsigned long long initialRID = boost::variate_generator<boost::mt19937&, boost::uniform_int<unsigned long long> >(random, dist)(); | 51 | unsigned long long initialRID = boost::variate_generator<boost::mt19937&, boost::uniform_int<unsigned long long> >(random, dist)(); |
| 51 | 52 | ||
| 52 | connectionPool = new BOSHConnectionPool(boshURL, resolver, connectionFactory, xmlParserFactory, tlsContextFactory, timerFactory, eventLoop, to, initialRID, boshHTTPConnectProxyURL, boshHTTPConnectProxyAuthID, boshHTTPConnectProxyAuthPassword); | 53 | connectionPool = new BOSHConnectionPool(boshURL, resolver, connectionFactory, xmlParserFactory, tlsContextFactory, timerFactory, eventLoop, to, initialRID, boshHTTPConnectProxyURL, boshHTTPConnectProxyAuthID, boshHTTPConnectProxyAuthPassword, tlsOptions); |
| 53 | connectionPool->onSessionTerminated.connect(boost::bind(&BOSHSessionStream::handlePoolSessionTerminated, this, _1)); | 54 | connectionPool->onSessionTerminated.connect(boost::bind(&BOSHSessionStream::handlePoolSessionTerminated, this, _1)); |
| 54 | connectionPool->onSessionStarted.connect(boost::bind(&BOSHSessionStream::handlePoolSessionStarted, this)); | 55 | connectionPool->onSessionStarted.connect(boost::bind(&BOSHSessionStream::handlePoolSessionStarted, this)); |
| 55 | connectionPool->onXMPPDataRead.connect(boost::bind(&BOSHSessionStream::handlePoolXMPPDataRead, this, _1)); | 56 | connectionPool->onXMPPDataRead.connect(boost::bind(&BOSHSessionStream::handlePoolXMPPDataRead, this, _1)); |
Swift