1 files changed, 20 insertions, 14 deletions
diff --git a/Swiften/Network/BOSHConnectionPool.cpp b/Swiften/Network/BOSHConnectionPool.cpp
index a30bf7b..7d43f42 100644
--- a/Swiften/Network/BOSHConnectionPool.cpp
+++ b/Swiften/Network/BOSHConnectionPool.cpp
@@ -1,83 +1,88 @@
 /*
  * Copyright (c) 2011 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 #include <Swiften/Network/BOSHConnectionPool.h>
 
 #include <climits>
 
 #include <boost/bind.hpp>
 #include <boost/lexical_cast.hpp>
 
 #include <Swiften/Base/foreach.h>
 #include <Swiften/Base/SafeString.h>
 #include <Swiften/Network/TLSConnectionFactory.h>
 #include <Swiften/Network/HTTPConnectProxiedConnectionFactory.h>
+#include <Swiften/Network/CachingNameOnlyDomainNameResolver.h>
 
 namespace Swift {
-BOSHConnectionPool::BOSHConnectionPool(const URL& boshURL, ConnectionFactory* connectionFactory, XMLParserFactory* parserFactory, TLSContextFactory* tlsFactory, const std::string& to, long initialRID, const URL& boshHTTPConnectProxyURL, const SafeString& boshHTTPConnectProxyAuthID, const SafeString& boshHTTPConnectProxyAuthPassword) :
+BOSHConnectionPool::BOSHConnectionPool(const URL& boshURL, DomainNameResolver* realResolver, ConnectionFactory* connectionFactoryParameter, XMLParserFactory* parserFactory, TLSContextFactory* tlsFactory, TimerFactory* timerFactory, EventLoop* eventLoop, const std::string& to, unsigned long long initialRID, const URL& boshHTTPConnectProxyURL, const SafeString& boshHTTPConnectProxyAuthID, const SafeString& boshHTTPConnectProxyAuthPassword) :
 		boshURL(boshURL),
-		connectionFactory(connectionFactory),
+		connectionFactory(connectionFactoryParameter),
 		xmlParserFactory(parserFactory),
 		tlsFactory(tlsFactory),
+		timerFactory(timerFactory),
 		rid(initialRID),
 		pendingTerminate(false),
 		to(to),
 		requestLimit(2),
 		restartCount(0),
 		pendingRestart(false) {
-	tlsConnectionFactory = NULL;
-	if (boshHTTPConnectProxyURL.empty()) {
-		connectProxyFactory = NULL;
-	}
-	else {
-		ConnectionFactory* rawFactory = connectionFactory;
+
+	if (!boshHTTPConnectProxyURL.empty()) {
 		if (boshHTTPConnectProxyURL.getScheme() == "https") {
-			tlsConnectionFactory = new TLSConnectionFactory(tlsFactory, rawFactory);
-			rawFactory = tlsConnectionFactory;
+			connectionFactory = new TLSConnectionFactory(tlsFactory, connectionFactory);
+			myConnectionFactories.push_back(connectionFactory);
 		}
-		connectProxyFactory = new HTTPConnectProxiedConnectionFactory(rawFactory, HostAddressPort(HostAddress(boshHTTPConnectProxyURL.getHost()), boshHTTPConnectProxyURL.getPort()), boshHTTPConnectProxyAuthID, boshHTTPConnectProxyAuthPassword);
+		connectionFactory = new HTTPConnectProxiedConnectionFactory(realResolver, connectionFactory, timerFactory, eventLoop, boshHTTPConnectProxyURL.getHost(), boshHTTPConnectProxyURL.getPort(), boshHTTPConnectProxyAuthID, boshHTTPConnectProxyAuthPassword);
 	}
+	if (boshURL.getScheme() == "https") {
+		connectionFactory = new TLSConnectionFactory(tlsFactory, connectionFactory);
+		myConnectionFactories.push_back(connectionFactory);
+	}
+	resolver = new CachingNameOnlyDomainNameResolver(realResolver, eventLoop);
 	createConnection();
 }
 
 BOSHConnectionPool::~BOSHConnectionPool() {
 	close();
-	delete connectProxyFactory;
-	delete tlsConnectionFactory;
+	foreach (ConnectionFactory* factory, myConnectionFactories) {
+		delete factory;
+	}
+	delete resolver;
 }
 
 void BOSHConnectionPool::write(const SafeByteArray& data) {
 	dataQueue.push_back(data);
 	tryToSendQueuedData();
 }
 
 void BOSHConnectionPool::handleDataRead(const SafeByteArray& data) {
 	onXMPPDataRead(data);
 	tryToSendQueuedData(); /* Will rebalance the connections */
 }
 
 void BOSHConnectionPool::restartStream() {
 	BOSHConnection::ref connection = getSuitableConnection();
 	if (connection) {
 		pendingRestart = false;
 		rid++;
 		connection->setRID(rid);
 		connection->restartStream();
 		restartCount++;
 	}
 	else {
 		pendingRestart = true;
 	}
 }
 
 void BOSHConnectionPool::writeFooter() {
 	pendingTerminate = true;
 	tryToSendQueuedData();
 }
 
 void BOSHConnectionPool::close() {
 	/* TODO: Send a terminate here. */
 	std::vector<BOSHConnection::ref> connectionCopies = connections;
 	foreach (BOSHConnection::ref connection, connectionCopies) {
@@ -177,71 +182,72 @@ void BOSHConnectionPool::tryToSendQueuedData() {
 					suitableConnection->write(createSafeByteArray(""));
 				}
 				else {
 				/* My thought process I went through when writing this, to aid anyone else confused why this can happen...
 				 *
 				 * What to do here? I think this isn't possible.
 				   If you didn't have two connections, suitable would have made one.
 				   If you have two connections and neither is suitable, pending would be true.
 				   If you have a non-pending connection, it's suitable.
 
 				   If I decide to do something here, remove assert above.
 
 				   Ah! Yes, because there's a period between creating the connection and it being connected. */
 				}
 			}
 		}
 	}
 }
 
 void BOSHConnectionPool::handleHTTPError(const std::string& /*errorCode*/) {
 	handleSessionTerminated(boost::make_shared<BOSHError>(BOSHError::UndefinedCondition));
 }
 
 void BOSHConnectionPool::handleConnectionDisconnected(bool error, BOSHConnection::ref connection) {
 	destroyConnection(connection);
 	if (false && error) {
 		handleSessionTerminated(boost::make_shared<BOSHError>(BOSHError::UndefinedCondition));
 	}
 	else {
 		/* We might have just freed up a connection slot to send with */
 		tryToSendQueuedData();
 	}
 }
 
 boost::shared_ptr<BOSHConnection> BOSHConnectionPool::createConnection() {
-	BOSHConnection::ref connection = BOSHConnection::create(boshURL, connectProxyFactory ? connectProxyFactory : connectionFactory, xmlParserFactory, tlsFactory);
+	Connector::ref connector = Connector::create(boshURL.getHost(), resolver, connectionFactory, timerFactory, boshURL.getPort());
+	BOSHConnection::ref connection = BOSHConnection::create(boshURL, connector, xmlParserFactory);
 	connection->onXMPPDataRead.connect(boost::bind(&BOSHConnectionPool::handleDataRead, this, _1));
 	connection->onSessionStarted.connect(boost::bind(&BOSHConnectionPool::handleSessionStarted, this, _1, _2));
 	connection->onBOSHDataRead.connect(boost::bind(&BOSHConnectionPool::handleBOSHDataRead, this, _1));
 	connection->onBOSHDataWritten.connect(boost::bind(&BOSHConnectionPool::handleBOSHDataWritten, this, _1));
 	connection->onDisconnected.connect(boost::bind(&BOSHConnectionPool::handleConnectionDisconnected, this, _1, connection));
 	connection->onConnectFinished.connect(boost::bind(&BOSHConnectionPool::handleConnectFinished, this, _1, connection));
 	connection->onSessionTerminated.connect(boost::bind(&BOSHConnectionPool::handleSessionTerminated, this, _1));
 	connection->onHTTPError.connect(boost::bind(&BOSHConnectionPool::handleHTTPError, this, _1));
 	connection->connect();
 	connections.push_back(connection);
 	return connection;
 }
 
 void BOSHConnectionPool::destroyConnection(boost::shared_ptr<BOSHConnection> connection) {
 	connections.erase(std::remove(connections.begin(), connections.end(), connection), connections.end());
 	connection->onXMPPDataRead.disconnect(boost::bind(&BOSHConnectionPool::handleDataRead, this, _1));
 	connection->onSessionStarted.disconnect(boost::bind(&BOSHConnectionPool::handleSessionStarted, this, _1, _2));
 	connection->onBOSHDataRead.disconnect(boost::bind(&BOSHConnectionPool::handleBOSHDataRead, this, _1));
 	connection->onBOSHDataWritten.disconnect(boost::bind(&BOSHConnectionPool::handleBOSHDataWritten, this, _1));
 	connection->onDisconnected.disconnect(boost::bind(&BOSHConnectionPool::handleConnectionDisconnected, this, _1, connection));
 	connection->onConnectFinished.disconnect(boost::bind(&BOSHConnectionPool::handleConnectFinished, this, _1, connection));
 	connection->onSessionTerminated.disconnect(boost::bind(&BOSHConnectionPool::handleSessionTerminated, this, _1));
 	connection->onHTTPError.disconnect(boost::bind(&BOSHConnectionPool::handleHTTPError, this, _1));
 }
 
 void BOSHConnectionPool::handleSessionTerminated(BOSHError::ref error) {
 	onSessionTerminated(error);
 }
 
 void BOSHConnectionPool::handleBOSHDataRead(const SafeByteArray& data) {
 	onBOSHDataRead(data);
 }
 
 void BOSHConnectionPool::handleBOSHDataWritten(const SafeByteArray& data) {
 	onBOSHDataWritten(data);