1 files changed, 7 insertions, 3 deletions
diff --git a/Swiften/Network/StaticDomainNameResolver.cpp b/Swiften/Network/StaticDomainNameResolver.cpp
index 95b3dd9..eca6687 100644
--- a/Swiften/Network/StaticDomainNameResolver.cpp
+++ b/Swiften/Network/StaticDomainNameResolver.cpp
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/StaticDomainNameResolver.h>
@@ -48,10 +48,14 @@ namespace {
 
         virtual void run() {
             if (!resolver->getIsResponsive()) {
                 return;
             }
+            if (auto address = HostAddress::fromString(host)) {
+                // IP Literals should resolve to themselves
+                resolver->addAddress(host, *address);
+            }
             StaticDomainNameResolver::AddressesMap::const_iterator i = resolver->getAddresses().find(host);
             if (i != resolver->getAddresses().end()) {
                 eventLoop->postEvent(
                         boost::bind(&AddressQuery::emitOnResult, shared_from_this(), i->second, boost::optional<DomainNameResolveError>()));
             }
@@ -96,18 +100,18 @@ void StaticDomainNameResolver::addService(const std::string& service, const Doma
     services.push_back(std::make_pair(service, result));
 }
 
 void StaticDomainNameResolver::addXMPPClientService(const std::string& domain, const HostAddressPort& address) {
     static int hostid = 0;
-    std::string hostname(std::string("host-") + boost::lexical_cast<std::string>(hostid));
+    std::string hostname(std::string("host-") + std::to_string(hostid));
     hostid++;
 
     addService("_xmpp-client._tcp." + domain, ServiceQuery::Result(hostname, address.getPort(), 0, 0));
     addAddress(hostname, address.getAddress());
 }
 
-void StaticDomainNameResolver::addXMPPClientService(const std::string& domain, const std::string& hostname, int port) {
+void StaticDomainNameResolver::addXMPPClientService(const std::string& domain, const std::string& hostname, unsigned short port) {
     addService("_xmpp-client._tcp." + domain, ServiceQuery::Result(hostname, port, 0, 0));
 }
 
 std::shared_ptr<DomainNameServiceQuery> StaticDomainNameResolver::createServiceQuery(const std::string& serviceLookupPrefix, const std::string& domain) {
     return std::make_shared<ServiceQuery>(serviceLookupPrefix + domain, this, eventLoop, owner);