1 files changed, 17 insertions, 12 deletions
diff --git a/Swiften/Network/Connector.cpp b/Swiften/Network/Connector.cpp
index 5e7f8d9..02ebb02 100644
--- a/Swiften/Network/Connector.cpp
+++ b/Swiften/Network/Connector.cpp
@@ -11,40 +11,45 @@
 
 #include <Swiften/Network/ConnectionFactory.h>
 #include <Swiften/Network/DomainNameResolver.h>
 #include <Swiften/Network/DomainNameAddressQuery.h>
 #include <Swiften/Network/TimerFactory.h>
 #include <Swiften/Base/Log.h>
 
 namespace Swift {
 
-Connector::Connector(const std::string& hostname, DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory, int defaultPort) : hostname(hostname), resolver(resolver), connectionFactory(connectionFactory), timerFactory(timerFactory), defaultPort(defaultPort), timeoutMilliseconds(0), queriedAllServices(true), foundSomeDNS(false) {
+Connector::Connector(const std::string& hostname, int port, bool doServiceLookups, DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory) : hostname(hostname), port(port), doServiceLookups(doServiceLookups), resolver(resolver), connectionFactory(connectionFactory), timerFactory(timerFactory), timeoutMilliseconds(0), queriedAllServices(true), foundSomeDNS(false) {
 }
 
 void Connector::setTimeoutMilliseconds(int milliseconds) {
 	timeoutMilliseconds = milliseconds;
 }
 
 void Connector::start() {
 	SWIFT_LOG(debug) << "Starting connector for " << hostname << std::endl;
 	//std::cout << "Connector::start()" << std::endl;
 	assert(!currentConnection);
 	assert(!serviceQuery);
 	assert(!timer);
 	queriedAllServices = false;
-	serviceQuery = resolver->createServiceQuery("_xmpp-client._tcp." + hostname);
-	serviceQuery->onResult.connect(boost::bind(&Connector::handleServiceQueryResult, shared_from_this(), _1));
-	if (timeoutMilliseconds > 0) {
-		timer = timerFactory->createTimer(timeoutMilliseconds);
-		timer->onTick.connect(boost::bind(&Connector::handleTimeout, shared_from_this()));
-		timer->start();
-	}
-	serviceQuery->run();
+	if (doServiceLookups) {
+		serviceQuery = resolver->createServiceQuery("_xmpp-client._tcp." + hostname);
+		serviceQuery->onResult.connect(boost::bind(&Connector::handleServiceQueryResult, shared_from_this(), _1));
+		if (timeoutMilliseconds > 0) {
+			timer = timerFactory->createTimer(timeoutMilliseconds);
+			timer->onTick.connect(boost::bind(&Connector::handleTimeout, shared_from_this()));
+			timer->start();
+		}
+		serviceQuery->run();
+	}
+	else {
+		queryAddress(hostname);
+	}
 }
 
 void Connector::stop() {
 	finish(boost::shared_ptr<Connection>());
 }
 
 void Connector::queryAddress(const std::string& hostname) {
 	assert(!addressQuery);
 	addressQuery = resolver->createAddressQuery(hostname);
@@ -103,24 +108,24 @@ void Connector::tryNextAddress() {
 			serviceQueryResults.pop_front();
 		}
 		tryNextServiceOrFallback();
 	}
 	else {
 		SWIFT_LOG(debug) << "Trying next address" << std::endl;
 		HostAddress address = addressQueryResults.front();
 		addressQueryResults.pop_front();
 
-		int port = defaultPort;
+		int connectPort = (port == -1 ? 5222 : port);
 		if (!serviceQueryResults.empty()) {
-			port = serviceQueryResults.front().port;
+			connectPort = serviceQueryResults.front().port;
 		}
 
-		tryConnect(HostAddressPort(address, port));
+		tryConnect(HostAddressPort(address, connectPort));
 	}
 }
 
 void Connector::tryConnect(const HostAddressPort& target) {
 	assert(!currentConnection);
 	SWIFT_LOG(debug) << "Trying to connect to " << target.getAddress().toString() << ":" << target.getPort() << std::endl;
 	currentConnection = connectionFactory->createConnection();
 	currentConnection->onConnectFinished.connect(boost::bind(&Connector::handleConnectionConnectFinished, shared_from_this(), _1));
 	currentConnection->connect(target);