1 files changed, 39 insertions, 15 deletions
diff --git a/Swiften/Network/StaticDomainNameResolver.cpp b/Swiften/Network/StaticDomainNameResolver.cpp
index 8ca4062..275ec78 100644
--- a/Swiften/Network/StaticDomainNameResolver.cpp
+++ b/Swiften/Network/StaticDomainNameResolver.cpp
@@ -1,28 +1,52 @@
 #include "Swiften/Network/StaticDomainNameResolver.h"
-#include "Swiften/Network/DomainNameResolveException.h"
+#include "Swiften/Network/DomainNameResolveError.h"
 #include "Swiften/Base/String.h"
 
+using namespace Swift;
+
+namespace {
+	struct ServiceQuery : public DomainNameServiceQuery {
+		ServiceQuery(const String& service, Swift::StaticDomainNameResolver* resolver) : service(service), resolver(resolver) {}
+
+		virtual void run() {
+		}
+
+		String service;
+		StaticDomainNameResolver* resolver;
+	};
+
+	struct AddressQuery : public DomainNameAddressQuery {
+		AddressQuery(const String& host, StaticDomainNameResolver* resolver) : host(host), resolver(resolver) {}
+
+		virtual void run() {
+		}
+
+		String host;
+		StaticDomainNameResolver* resolver;
+	};
+}
+
 namespace Swift {
 
-StaticDomainNameResolver::StaticDomainNameResolver() {
+void StaticDomainNameResolver::addAddress(const String& domain, const HostAddress& address) {
+	addresses[domain] = address;
 }
 
-std::vector<HostAddressPort> StaticDomainNameResolver::resolve(const String& queriedDomain) {
-	std::vector<HostAddressPort> result;
+void StaticDomainNameResolver::addService(const String& service, const DomainNameServiceQuery::Result& result) {
+	services.push_back(std::make_pair(service, result));
+}
 
-	for(DomainCollection::const_iterator i = domains.begin(); i != domains.end(); ++i) {
-		if (i->first == queriedDomain) {
-			result.push_back(i->second);
-		}
-	}
-	if (result.empty()) {
-		throw DomainNameResolveException();
-	}
-	return result;
+void StaticDomainNameResolver::addXMPPClientService(const String& domain, const HostAddressPort& address) {
+	addService("_xmpp-client._tcp." + domain, ServiceQuery::Result(domain, 5222, 0, 0));
+	addAddress(domain, address.getAddress());
+}
+
+boost::shared_ptr<DomainNameServiceQuery> StaticDomainNameResolver::createServiceQuery(const String& name) {
+	return boost::shared_ptr<DomainNameServiceQuery>(new ServiceQuery(name, this));
 }
 
-void StaticDomainNameResolver::addDomain(const String& domain, const HostAddressPort& addressPort) {
-	domains.push_back(std::make_pair(domain, addressPort));
+boost::shared_ptr<DomainNameAddressQuery> StaticDomainNameResolver::createAddressQuery(const String& name) {
+	return boost::shared_ptr<DomainNameAddressQuery>(new AddressQuery(name, this));
 }
 
 }