1 files changed, 3 insertions, 2 deletions
diff --git a/Swiften/Network/Connector.cpp b/Swiften/Network/Connector.cpp
index 37cf35d..457d8a9 100644
--- a/Swiften/Network/Connector.cpp
+++ b/Swiften/Network/Connector.cpp
@@ -3,73 +3,74 @@
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/Connector.h>
 
 #include <boost/bind.hpp>
 
 #include <Swiften/Base/Log.h>
 #include <Swiften/Network/ConnectionFactory.h>
 #include <Swiften/Network/DomainNameAddressQuery.h>
 #include <Swiften/Network/DomainNameResolver.h>
 #include <Swiften/Network/HostAddress.h>
 #include <Swiften/Network/TimerFactory.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;
     assert(!currentConnection);
     assert(!serviceQuery);
     assert(!timer);
     queriedAllServices = false;
+    auto hostAddress = HostAddress::fromString(hostname);
     if (timeoutMilliseconds > 0) {
         timer = timerFactory->createTimer(timeoutMilliseconds);
         timer->onTick.connect(boost::bind(&Connector::handleTimeout, shared_from_this()));
     }
     if (serviceLookupPrefix) {
         serviceQuery = resolver->createServiceQuery(*serviceLookupPrefix, hostname);
         serviceQuery->onResult.connect(boost::bind(&Connector::handleServiceQueryResult, shared_from_this(), _1));
         serviceQuery->run();
     }
-    else if (HostAddress(hostname).isValid()) {
+    else if (hostAddress) {
         // hostname is already a valid address; skip name lookup.
         foundSomeDNS = true;
-        addressQueryResults.push_back(HostAddress(hostname));
+        addressQueryResults.push_back(hostAddress.get());
         tryNextAddress();
     } else {
         queryAddress(hostname);
     }
 }
 
 void Connector::stop() {
     if (currentConnection) {
         currentConnection->onConnectFinished.disconnect(boost::bind(&Connector::handleConnectionConnectFinished, shared_from_this(), _1));
         currentConnection->disconnect();
     }
     finish(std::shared_ptr<Connection>());
 }
 
 void Connector::queryAddress(const std::string& hostname) {
     assert(!addressQuery);
     addressQuery = resolver->createAddressQuery(hostname);
     addressQuery->onResult.connect(boost::bind(&Connector::handleAddressQueryResult, shared_from_this(), _1, _2));
     addressQuery->run();
 }
 
 void Connector::handleServiceQueryResult(const std::vector<DomainNameServiceQuery::Result>& result) {
     SWIFT_LOG(debug) << result.size() << " SRV result(s)" << std::endl;
     serviceQueryResults = std::deque<DomainNameServiceQuery::Result>(result.begin(), result.end());
     serviceQuery.reset();
     if (!serviceQueryResults.empty()) {
         foundSomeDNS = true;
     }
     tryNextServiceOrFallback();
 }