1 files changed, 10 insertions, 6 deletions
diff --git a/Swiften/Network/Connector.cpp b/Swiften/Network/Connector.cpp
index cb062d7..5510acb 100644
--- a/Swiften/Network/Connector.cpp
+++ b/Swiften/Network/Connector.cpp
@@ -1,35 +1,34 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/Connector.h>
 
 #include <boost/bind.hpp>
-#include <iostream>
 
+#include <Swiften/Base/Log.h>
 #include <Swiften/Network/ConnectionFactory.h>
-#include <Swiften/Network/DomainNameResolver.h>
 #include <Swiften/Network/DomainNameAddressQuery.h>
+#include <Swiften/Network/DomainNameResolver.h>
+#include <Swiften/Network/HostAddress.h>
 #include <Swiften/Network/TimerFactory.h>
-#include <Swiften/Base/Log.h>
 
 namespace Swift {
 
 Connector::Connector(const std::string& hostname, int port, const boost::optional<std::string>& serviceLookupPrefix, DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory) : hostname(hostname), port(port), serviceLookupPrefix(serviceLookupPrefix), 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;
 	if (timeoutMilliseconds > 0) {
 		timer = timerFactory->createTimer(timeoutMilliseconds);
@@ -37,13 +36,18 @@ void Connector::start() {
 	}
 	if (serviceLookupPrefix) {
 		serviceQuery = resolver->createServiceQuery(*serviceLookupPrefix, hostname);
 		serviceQuery->onResult.connect(boost::bind(&Connector::handleServiceQueryResult, shared_from_this(), _1));
 		serviceQuery->run();
 	}
-	else {
+	else if (HostAddress(hostname).isValid()) {
+		// hostname is already a valid address; skip name lookup.
+		foundSomeDNS = true;
+		addressQueryResults.push_back(HostAddress(hostname));
+		tryNextAddress();
+	} else {
 		queryAddress(hostname);
 	}
 }
 
 void Connector::stop() {
 	finish(boost::shared_ptr<Connection>());