summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2011-12-13 17:09:18 (GMT)
committerKevin Smith <git@kismith.co.uk>2011-12-13 17:09:18 (GMT)
commit169e5fa001c817b170da6f991edfa994cf2d7f45 (patch)
treeba5004e8ded97ddcc9f518fbe8c99db97637f6d2
parent902e2ee8e61acb18d2819e8a59a28921f85bbd77 (diff)
downloadswift-contrib-169e5fa001c817b170da6f991edfa994cf2d7f45.zip
swift-contrib-169e5fa001c817b170da6f991edfa994cf2d7f45.tar.bz2
Fix use of int randoms for populating long
-rw-r--r--Swiften/Network/HTTPConnectProxiedConnection.cpp1
-rw-r--r--Swiften/Session/BOSHSessionStream.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/Swiften/Network/HTTPConnectProxiedConnection.cpp b/Swiften/Network/HTTPConnectProxiedConnection.cpp
index edbdd82..9ef63f0 100644
--- a/Swiften/Network/HTTPConnectProxiedConnection.cpp
+++ b/Swiften/Network/HTTPConnectProxiedConnection.cpp
@@ -34,6 +34,7 @@ HTTPConnectProxiedConnection::HTTPConnectProxiedConnection(ConnectionFactory* co
HTTPConnectProxiedConnection::~HTTPConnectProxiedConnection() {
if (connection_) {
+ connection_->onConnectFinished.disconnect(boost::bind(&HTTPConnectProxiedConnection::handleConnectionConnectFinished, shared_from_this(), _1));
connection_->onDataRead.disconnect(boost::bind(&HTTPConnectProxiedConnection::handleDataRead, shared_from_this(), _1));
connection_->onDisconnected.disconnect(boost::bind(&HTTPConnectProxiedConnection::handleDisconnected, shared_from_this(), _1));
}
diff --git a/Swiften/Session/BOSHSessionStream.cpp b/Swiften/Session/BOSHSessionStream.cpp
index 95390f4..73bbfd6 100644
--- a/Swiften/Session/BOSHSessionStream.cpp
+++ b/Swiften/Session/BOSHSessionStream.cpp
@@ -48,9 +48,9 @@ BOSHSessionStream::BOSHSessionStream(
firstHeader(true) {
boost::mt19937 random;
- boost::uniform_int<> dist(0, LONG_MAX);
+ boost::uniform_int<long> dist(0, LONG_MAX);
random.seed(time(NULL));
- boost::variate_generator<boost::mt19937&, boost::uniform_int<> > randomRID(random, dist);
+ boost::variate_generator<boost::mt19937&, boost::uniform_int<long> > randomRID(random, dist);
long initialRID = randomRID();
connectionPool = new BOSHConnectionPool(connectionFactory, to, initialRID, boshHTTPConnectProxyURL, boshHTTPConnectProxyAuthID, boshHTTPConnectProxyAuthPassword);