Modularize DNS

The DNS modules are temporarily in commands/ so they're loaded automatically

Thanks to Attila for helping with much of this.

7 files changed, 231 insertions, 188 deletions

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 7259f9459..9d87a01b3 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -25,6 +25,7 @@
 
 #include "inspircd.h"
 #include "xline.h"
+#include "modules/dns.h"
 
 /* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */
 
@@ -116,21 +117,21 @@ class CommandWebirc : public Command
 
 /** Resolver for CGI:IRC hostnames encoded in ident/GECOS
  */
-class CGIResolver : public Resolver
+class CGIResolver : public DNS::Request
 {
 	std::string typ;
 	std::string theiruid;
 	LocalIntExt& waiting;
 	bool notify;
  public:
-	CGIResolver(Module* me, bool NotifyOpers, const std::string &source, LocalUser* u,
-			const std::string &type, bool &cached, LocalIntExt& ext)
-		: Resolver(source, DNS_QUERY_PTR4, cached, me), typ(type), theiruid(u->uuid),
+	CGIResolver(DNS::Manager *mgr, Module* me, bool NotifyOpers, const std::string &source, LocalUser* u,
+			const std::string &ttype, LocalIntExt& ext)
+		: DNS::Request(mgr, me, source, DNS::QUERY_PTR), typ(ttype), theiruid(u->uuid),
 		waiting(ext), notify(NotifyOpers)
 	{
 	}
 
-	virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
+	void OnLookupComplete(const DNS::Query *r)
 	{
 		/* Check the user still exists */
 		User* them = ServerInstance->FindUUID(theiruid);
@@ -140,19 +141,20 @@ class CGIResolver : public Resolver
 			if (!lu)
 				return;
 
+			const DNS::ResourceRecord &ans_record = r->answers[0];
+			if (ans_record.rdata.empty() || ans_record.rdata.length() > 64)
+				return;
+
 			if (notify)
-				ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick.c_str(), them->host.c_str(), result.c_str(), typ.c_str());
+				ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick.c_str(), them->host.c_str(), ans_record.rdata.c_str(), typ.c_str());
 
-			if (result.length() > 64)
-				return;
-			them->host = result;
-			them->dhost = result;
+			them->host = them->dhost = ans_record.rdata;
 			them->InvalidateCache();
 			lu->CheckLines(true);
 		}
 	}
 
-	virtual void OnError(ResolverError e, const std::string &errormessage)
+	void OnError(const DNS::Query *r)
 	{
 		if (!notify)
 			return;
@@ -179,6 +181,8 @@ class ModuleCgiIRC : public Module
 {
 	CommandWebirc cmd;
 	LocalIntExt waiting;
+	dynamic_reference<DNS::Manager> DNS;
+	bool nouserdns;
 
 	static void RecheckClass(LocalUser* user)
 	{
@@ -204,25 +208,31 @@ class ModuleCgiIRC : public Module
 		user->InvalidateCache();
 		RecheckClass(user);
 		// Don't create the resolver if the core couldn't put the user in a connect class or when dns is disabled
-		if (user->quitting || ServerInstance->Config->NoUserDns)
+		if (user->quitting || !DNS || nouserdns)
 			return;
 
+		CGIResolver* r = new CGIResolver(*this->DNS, this, cmd.notify, newip, user, (was_pass ? "PASS" : "IDENT"), waiting);
 		try
 		{
-			bool cached;
-			CGIResolver* r = new CGIResolver(this, cmd.notify, newip, user, (was_pass ? "PASS" : "IDENT"), cached, waiting);
-			ServerInstance->AddResolver(r, cached);
 			waiting.set(user, waiting.get(user) + 1);
+			this->DNS->Process(r);
 		}
-		catch (...)
+		catch (DNS::Exception &ex)
 		{
+			int count = waiting.get(user);
+			if (count)
+				waiting.set(user, count - 1);
+			delete r;
 			if (cmd.notify)
-				 ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname!", user->nick.c_str(), user->host.c_str());
+				 ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname; %s", user->nick.c_str(), user->host.c_str(), ex.GetReason());
 		}
 	}
 
 public:
-	ModuleCgiIRC() : cmd(this), waiting("cgiirc-delay", this)
+	ModuleCgiIRC()
+		: cmd(this)
+		, waiting("cgiirc-delay", this)
+		, DNS(this, "DNS")
 	{
 	}
 
@@ -238,6 +248,7 @@ public:
 
 	void OnRehash(User* user)
 	{
+		nouserdns =	ServerInstance->Config->ConfValue("performance")->getBool("nouserdns");
 		cmd.Hosts.clear();
 
 		// Do we send an oper notice when a CGI:IRC has their host changed?
diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 8429eb21b..9e0b89fc3 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -23,6 +23,7 @@
 
 #include "inspircd.h"
 #include "xline.h"
+#include "modules/dns.h"
 
 /* $ModDesc: Provides handling of DNS blacklists */
 
@@ -45,7 +46,7 @@ class DNSBLConfEntry
 
 /** Resolver for CGI:IRC hostnames encoded in ident/GECOS
  */
-class DNSBLResolver : public Resolver
+class DNSBLResolver : public DNS::Request
 {
 	std::string theiruid;
 	LocalStringExt& nameExt;
@@ -54,157 +55,158 @@ class DNSBLResolver : public Resolver
 
  public:
 
-	DNSBLResolver(Module *me, LocalStringExt& match, LocalIntExt& ctr, const std::string &hostname, LocalUser* u, DNSBLConfEntry *conf, bool &cached)
-		: Resolver(hostname, DNS_QUERY_A, cached, me), theiruid(u->uuid), nameExt(match), countExt(ctr), ConfEntry(conf)
+	DNSBLResolver(DNS::Manager *mgr, Module *me, LocalStringExt& match, LocalIntExt& ctr, const std::string &hostname, LocalUser* u, DNSBLConfEntry *conf)
+		: DNS::Request(mgr, me, hostname, DNS::QUERY_A, true), theiruid(u->uuid), nameExt(match), countExt(ctr), ConfEntry(conf)
 	{
 	}
 
 	/* Note: This may be called multiple times for multiple A record results */
-	virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
+	void OnLookupComplete(const DNS::Query *r)
 	{
 		/* Check the user still exists */
 		LocalUser* them = (LocalUser*)ServerInstance->FindUUID(theiruid);
-		if (them)
+		if (!them)
+			return;
+
+		const DNS::ResourceRecord &ans_record = r->answers[0];
+
+		int i = countExt.get(them);
+		if (i)
+			countExt.set(them, i - 1);
+
+		// Now we calculate the bitmask: 256*(256*(256*a+b)+c)+d
+
+		unsigned int bitmask = 0, record = 0;
+		bool match = false;
+		in_addr resultip;
+
+		inet_aton(ans_record.rdata.c_str(), &resultip);
+
+		switch (ConfEntry->type)
+		{
+			case DNSBLConfEntry::A_BITMASK:
+				bitmask = resultip.s_addr >> 24; /* Last octet (network byte order) */
+				bitmask &= ConfEntry->bitmask;
+				match = (bitmask != 0);
+			break;
+			case DNSBLConfEntry::A_RECORD:
+				record = resultip.s_addr >> 24; /* Last octet */
+				match = (ConfEntry->records[record] == 1);
+			break;
+		}
+
+		if (match)
 		{
-			int i = countExt.get(them);
-			if (i)
-				countExt.set(them, i - 1);
-			// Now we calculate the bitmask: 256*(256*(256*a+b)+c)+d
-			if(result.length())
+			std::string reason = ConfEntry->reason;
+			std::string::size_type x = reason.find("%ip%");
+			while (x != std::string::npos)
 			{
-				unsigned int bitmask = 0, record = 0;
-				bool match = false;
-				in_addr resultip;
+				reason.erase(x, 4);
+				reason.insert(x, them->GetIPString());
+				x = reason.find("%ip%");
+			}
 
-				inet_aton(result.c_str(), &resultip);
+			ConfEntry->stats_hits++;
 
-				switch (ConfEntry->type)
+			switch (ConfEntry->banaction)
+			{
+				case DNSBLConfEntry::I_KILL:
 				{
-					case DNSBLConfEntry::A_BITMASK:
-						bitmask = resultip.s_addr >> 24; /* Last octet (network byte order) */
-						bitmask &= ConfEntry->bitmask;
-						match = (bitmask != 0);
-					break;
-					case DNSBLConfEntry::A_RECORD:
-						record = resultip.s_addr >> 24; /* Last octet */
-						match = (ConfEntry->records[record] == 1);
+					ServerInstance->Users->QuitUser(them, "Killed (" + reason + ")");
 					break;
 				}
-
-				if (match)
+				case DNSBLConfEntry::I_MARK:
 				{
-					std::string reason = ConfEntry->reason;
-					std::string::size_type x = reason.find("%ip%");
-					while (x != std::string::npos)
+					if (!ConfEntry->ident.empty())
 					{
-						reason.erase(x, 4);
-						reason.insert(x, them->GetIPString());
-						x = reason.find("%ip%");
+						them->WriteServ("304 " + them->nick + " :Your ident has been set to " + ConfEntry->ident + " because you matched " + reason);
+						them->ChangeIdent(ConfEntry->ident.c_str());
 					}
 
-					ConfEntry->stats_hits++;
-
-					switch (ConfEntry->banaction)
+					if (!ConfEntry->host.empty())
 					{
-						case DNSBLConfEntry::I_KILL:
-						{
-							ServerInstance->Users->QuitUser(them, "Killed (" + reason + ")");
-							break;
-						}
-						case DNSBLConfEntry::I_MARK:
-						{
-							if (!ConfEntry->ident.empty())
-							{
-								them->WriteServ("304 " + them->nick + " :Your ident has been set to " + ConfEntry->ident + " because you matched " + reason);
-								them->ChangeIdent(ConfEntry->ident.c_str());
-							}
-
-							if (!ConfEntry->host.empty())
-							{
-								them->WriteServ("304 " + them->nick + " :Your host has been set to " + ConfEntry->host + " because you matched " + reason);
-								them->ChangeDisplayedHost(ConfEntry->host.c_str());
-							}
-
-							nameExt.set(them, ConfEntry->name);
-							break;
-						}
-						case DNSBLConfEntry::I_KLINE:
-						{
-							KLine* kl = new KLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(),
-									"*", them->GetIPString());
-							if (ServerInstance->XLines->AddLine(kl,NULL))
-							{
-								std::string timestr = ServerInstance->TimeString(kl->expiry);
-								ServerInstance->SNO->WriteGlobalSno('x',"K:line added due to DNSBL match on *@%s to expire on %s: %s",
-									them->GetIPString().c_str(), timestr.c_str(), reason.c_str());
-								ServerInstance->XLines->ApplyLines();
-							}
-							else
-								delete kl;
-							break;
-						}
-						case DNSBLConfEntry::I_GLINE:
-						{
-							GLine* gl = new GLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(),
-									"*", them->GetIPString());
-							if (ServerInstance->XLines->AddLine(gl,NULL))
-							{
-								std::string timestr = ServerInstance->TimeString(gl->expiry);
-								ServerInstance->SNO->WriteGlobalSno('x',"G:line added due to DNSBL match on *@%s to expire on %s: %s",
-									them->GetIPString().c_str(), timestr.c_str(), reason.c_str());
-								ServerInstance->XLines->ApplyLines();
-							}
-							else
-								delete gl;
-							break;
-						}
-						case DNSBLConfEntry::I_ZLINE:
-						{
-							ZLine* zl = new ZLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(),
-									them->GetIPString());
-							if (ServerInstance->XLines->AddLine(zl,NULL))
-							{
-								std::string timestr = ServerInstance->TimeString(zl->expiry);
-								ServerInstance->SNO->WriteGlobalSno('x',"Z:line added due to DNSBL match on *@%s to expire on %s: %s",
-									them->GetIPString().c_str(), timestr.c_str(), reason.c_str());
-								ServerInstance->XLines->ApplyLines();
-							}
-							else
-								delete zl;
-							break;
-						}
-						case DNSBLConfEntry::I_UNKNOWN:
-						{
-							break;
-						}
-						break;
+						them->WriteServ("304 " + them->nick + " :Your host has been set to " + ConfEntry->host + " because you matched " + reason);
+						them->ChangeDisplayedHost(ConfEntry->host.c_str());
 					}
 
-					ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s%s detected as being on a DNS blacklist (%s) with result %d", them->nick.empty() ? "<unknown>" : "", them->GetFullRealHost().c_str(), ConfEntry->domain.c_str(), (ConfEntry->type==DNSBLConfEntry::A_BITMASK) ? bitmask : record);
+					nameExt.set(them, ConfEntry->name);
+					break;
 				}
-				else
-					ConfEntry->stats_misses++;
+				case DNSBLConfEntry::I_KLINE:
+				{
+					KLine* kl = new KLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(),
+							"*", them->GetIPString());
+					if (ServerInstance->XLines->AddLine(kl,NULL))
+					{
+						std::string timestr = ServerInstance->TimeString(kl->expiry);
+						ServerInstance->SNO->WriteGlobalSno('x',"K:line added due to DNSBL match on *@%s to expire on %s: %s",
+							them->GetIPString().c_str(), timestr.c_str(), reason.c_str());
+						ServerInstance->XLines->ApplyLines();
+					}
+					else
+						delete kl;
+					break;
+				}
+				case DNSBLConfEntry::I_GLINE:
+				{
+					GLine* gl = new GLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(),
+							"*", them->GetIPString());
+					if (ServerInstance->XLines->AddLine(gl,NULL))
+					{
+						std::string timestr = ServerInstance->TimeString(gl->expiry);
+						ServerInstance->SNO->WriteGlobalSno('x',"G:line added due to DNSBL match on *@%s to expire on %s: %s",
+							them->GetIPString().c_str(), timestr.c_str(), reason.c_str());
+						ServerInstance->XLines->ApplyLines();
+					}
+					else
+						delete gl;
+					break;
+				}
+				case DNSBLConfEntry::I_ZLINE:
+				{
+					ZLine* zl = new ZLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(),
+							them->GetIPString());
+					if (ServerInstance->XLines->AddLine(zl,NULL))
+					{
+						std::string timestr = ServerInstance->TimeString(zl->expiry);
+						ServerInstance->SNO->WriteGlobalSno('x',"Z:line added due to DNSBL match on *@%s to expire on %s: %s",
+							them->GetIPString().c_str(), timestr.c_str(), reason.c_str());
+						ServerInstance->XLines->ApplyLines();
+					}
+					else
+						delete zl;
+					break;
+				}
+				case DNSBLConfEntry::I_UNKNOWN:
+				default:
+					break;
 			}
-			else
-				ConfEntry->stats_misses++;
+
+			ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s%s detected as being on a DNS blacklist (%s) with result %d", them->nick.empty() ? "<unknown>" : "", them->GetFullRealHost().c_str(), ConfEntry->domain.c_str(), (ConfEntry->type==DNSBLConfEntry::A_BITMASK) ? bitmask : record);
 		}
+		else
+			ConfEntry->stats_misses++;
 	}
 
-	virtual void OnError(ResolverError e, const std::string &errormessage)
+	void OnError(const DNS::Query *q)
 	{
 		LocalUser* them = (LocalUser*)ServerInstance->FindUUID(theiruid);
-		if (them)
-		{
-			int i = countExt.get(them);
-			if (i)
-				countExt.set(them, i - 1);
-		}
+		if (!them)
+			return;
+
+		int i = countExt.get(them);
+		if (i)
+			countExt.set(them, i - 1);
+
+		if (q->error == DNS::ERROR_NO_RECORDS || q->error == DNS::ERROR_DOMAIN_NOT_FOUND)
+			ConfEntry->stats_misses++;
 	}
 };
 
 class ModuleDNSBL : public Module
 {
 	std::vector<DNSBLConfEntry *> DNSBLConfEntries;
+	dynamic_reference<DNS::Manager> DNS;
 	LocalStringExt nameExt;
 	LocalIntExt countExt;
 
@@ -227,7 +229,7 @@ class ModuleDNSBL : public Module
 		return DNSBLConfEntry::I_UNKNOWN;
 	}
  public:
-	ModuleDNSBL() : nameExt("dnsbl_match", this), countExt("dnsbl_pending", this) { }
+	ModuleDNSBL() : DNS(this, "DNS"), nameExt("dnsbl_match", this), countExt("dnsbl_pending", this) { }
 
 	void init()
 	{
@@ -347,7 +349,7 @@ class ModuleDNSBL : public Module
 
 	void OnSetUserIP(LocalUser* user)
 	{
-		if ((user->exempt) || (user->client_sa.sa.sa_family != AF_INET))
+		if ((user->exempt) || (user->client_sa.sa.sa_family != AF_INET) || !DNS)
 			return;
 
 		if (user->MyClass)
@@ -373,19 +375,25 @@ class ModuleDNSBL : public Module
 		countExt.set(user, DNSBLConfEntries.size());
 
 		// For each DNSBL, we will run through this lookup
-		unsigned int i = 0;
-		while (i < DNSBLConfEntries.size())
+		for (unsigned i = 0; i < DNSBLConfEntries.size(); ++i)
 		{
 			// Fill hostname with a dnsbl style host (d.c.b.a.domain.tld)
 			std::string hostname = reversedip + "." + DNSBLConfEntries[i]->domain;
 
 			/* now we'd need to fire off lookups for `hostname'. */
-			bool cached;
-			DNSBLResolver *r = new DNSBLResolver(this, nameExt, countExt, hostname, user, DNSBLConfEntries[i], cached);
-			ServerInstance->AddResolver(r, cached);
+			DNSBLResolver *r = new DNSBLResolver(*this->DNS, this, nameExt, countExt, hostname, user, DNSBLConfEntries[i]);
+			try
+			{
+				this->DNS->Process(r);
+			}
+			catch (DNS::Exception &ex)
+			{
+				delete r;
+				ServerInstance->Logs->Log("m_dnsbl", LOG_DEBUG, std::string(ex.GetReason()));
+			}
+
 			if (user->quitting)
 				break;
-			i++;
 		}
 	}
 
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 6cca6462c..018fcece7 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -37,7 +37,7 @@
 #include "protocolinterface.h"
 
 ModuleSpanningTree::ModuleSpanningTree()
-	: commands(NULL), Utils(NULL)
+	: commands(NULL), DNS(this, "DNS"), Utils(NULL)
 {
 }
 
@@ -269,8 +269,7 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
 		return;
 	}
 
-	QueryType start_type = DNS_QUERY_A;
-	start_type = DNS_QUERY_AAAA;
+	DNS::QueryType start_type = DNS::QUERY_AAAA;
 	if (strchr(x->IPAddr.c_str(),':'))
 	{
 		in6_addr n;
@@ -300,16 +299,20 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
 			ServerInstance->GlobalCulls.AddItem(newsocket);
 		}
 	}
+	else if (!DNS)
+	{
+		ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: Hostname given and m_dns.so is not loaded, unable to resolve.", x->Name.c_str());
+	}
 	else
 	{
+		ServernameResolver* snr = new ServernameResolver(Utils, *DNS, x->IPAddr, x, start_type, y);
 		try
 		{
-			bool cached = false;
-			ServernameResolver* snr = new ServernameResolver(Utils, x->IPAddr, x, cached, start_type, y);
-			ServerInstance->AddResolver(snr, cached);
+			DNS->Process(snr);
 		}
-		catch (ModuleException& e)
+		catch (DNS::Exception& e)
 		{
+			delete snr;
 			ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason());
 			ConnectServer(y, false);
 		}
diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 7401274c3..3ff369ea6 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -25,6 +25,7 @@
 
 #include "inspircd.h"
 
+#include "modules/dns.h"
 /** If you make a change which breaks the protocol, increment this.
  * If you  completely change the protocol, completely change the number.
  *
@@ -54,6 +55,8 @@ class ModuleSpanningTree : public Module
 	void LocalMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list, const char* message_type);
 
  public:
+	dynamic_reference<DNS::Manager> DNS;
+
 	SpanningTreeUtilities* Utils;
 
 	/** Set to true if inside a spanningtree call, to prevent sending
diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp
index ff5544064..b2d14069c 100644
--- a/src/modules/m_spanningtree/resolvers.cpp
+++ b/src/modules/m_spanningtree/resolvers.cpp
@@ -36,13 +36,15 @@
  * callback to OnLookupComplete or OnError when completed. Once it has completed we
  * will have an IP address which we can then use to continue our connection.
  */
-ServernameResolver::ServernameResolver(SpanningTreeUtilities* Util, const std::string &hostname, Link* x, bool &cached, QueryType qt, Autoconnect* myac)
-	: Resolver(hostname, qt, cached, Util->Creator), Utils(Util), query(qt), host(hostname), MyLink(x), myautoconnect(myac)
+ServernameResolver::ServernameResolver(SpanningTreeUtilities* Util, DNS::Manager *mgr, const std::string &hostname, Link* x, DNS::QueryType qt, Autoconnect* myac)
+	: DNS::Request(mgr, Util->Creator, hostname, qt), Utils(Util), query(qt), host(hostname), MyLink(x), myautoconnect(myac)
 {
 }
 
-void ServernameResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
+void ServernameResolver::OnLookupComplete(const DNS::Query *r)
 {
+	const DNS::ResourceRecord &ans_record = r->answers[0];
+
 	/* Initiate the connection, now that we have an IP to use.
 	 * Passing a hostname directly to BufferedSocket causes it to
 	 * just bail and set its FD to -1.
@@ -50,7 +52,7 @@ void ServernameResolver::OnLookupComplete(const std::string &result, unsigned in
 	TreeServer* CheckDupe = Utils->FindServer(MyLink->Name.c_str());
 	if (!CheckDupe) /* Check that nobody tried to connect it successfully while we were resolving */
 	{
-		TreeSocket* newsocket = new TreeSocket(Utils, MyLink, myautoconnect, result);
+		TreeSocket* newsocket = new TreeSocket(Utils, MyLink, myautoconnect, ans_record.rdata);
 		if (newsocket->GetFd() > -1)
 		{
 			/* We're all OK */
@@ -65,49 +67,64 @@ void ServernameResolver::OnLookupComplete(const std::string &result, unsigned in
 	}
 }
 
-void ServernameResolver::OnError(ResolverError e, const std::string &errormessage)
+void ServernameResolver::OnError(const DNS::Query *r)
 {
 	/* Ooops! */
-	if (query == DNS_QUERY_AAAA)
+	if (query == DNS::QUERY_AAAA)
 	{
-		bool cached = false;
-		ServernameResolver* snr = new ServernameResolver(Utils, host, MyLink, cached, DNS_QUERY_A, myautoconnect);
-		ServerInstance->AddResolver(snr, cached);
-		return;
+		ServernameResolver* snr = new ServernameResolver(Utils, this->manager, host, MyLink, DNS::QUERY_A, myautoconnect);
+		try
+		{
+			this->manager->Process(snr);
+			return;
+		}
+		catch (DNS::Exception &)
+		{
+			delete snr;
+		}
 	}
-	ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: Unable to resolve hostname - %s", MyLink->Name.c_str(), errormessage.c_str() );
+
+	ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: Unable to resolve hostname - %s", MyLink->Name.c_str(), this->manager->GetErrorStr(r->error).c_str());
 	Utils->Creator->ConnectServer(myautoconnect, false);
 }
 
-SecurityIPResolver::SecurityIPResolver(Module* me, SpanningTreeUtilities* U, const std::string &hostname, Link* x, bool &cached, QueryType qt)
-		: Resolver(hostname, qt, cached, me), MyLink(x), Utils(U), mine(me), host(hostname), query(qt)
+SecurityIPResolver::SecurityIPResolver(Module* me, SpanningTreeUtilities* U, DNS::Manager *mgr, const std::string &hostname, Link* x, DNS::QueryType qt)
+		: DNS::Request(mgr, me, hostname, qt), MyLink(x), Utils(U), mine(me), host(hostname), query(qt)
 {
 }
 
-void SecurityIPResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
+void SecurityIPResolver::OnLookupComplete(const DNS::Query *r)
 {
+	const DNS::ResourceRecord &ans_record = r->answers[0];
+
 	for (std::vector<reference<Link> >::iterator i = Utils->LinkBlocks.begin(); i != Utils->LinkBlocks.end(); ++i)
 	{
 		Link* L = *i;
 		if (L->IPAddr == host)
 		{
-			Utils->ValidIPs.push_back(result);
+			Utils->ValidIPs.push_back(ans_record.rdata);
 			break;
 		}
 	}
 }
 
-void SecurityIPResolver::OnError(ResolverError e, const std::string &errormessage)
+void SecurityIPResolver::OnError(const DNS::Query *r)
 {
-	if (query == DNS_QUERY_AAAA)
+	if (query == DNS::QUERY_AAAA)
 	{
-		bool cached = false;
-		SecurityIPResolver* res = new SecurityIPResolver(mine, Utils, host, MyLink, cached, DNS_QUERY_A);
-		ServerInstance->AddResolver(res, cached);
-		return;
+		SecurityIPResolver* res = new SecurityIPResolver(mine, Utils, this->manager, host, MyLink, DNS::QUERY_A);
+		try
+		{
+			this->manager->Process(res);
+			return;
+		}
+		catch (DNS::Exception &)
+		{
+			delete res;
+		}
 	}
 	ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Could not resolve IP associated with Link '%s': %s",
-		MyLink->Name.c_str(),errormessage.c_str());
+		MyLink->Name.c_str(), this->manager->GetErrorStr(r->error).c_str());
 }
 
 CacheRefreshTimer::CacheRefreshTimer(SpanningTreeUtilities* Util)
diff --git a/src/modules/m_spanningtree/resolvers.h b/src/modules/m_spanningtree/resolvers.h
index bcdf38625..83aaf8db0 100644
--- a/src/modules/m_spanningtree/resolvers.h
+++ b/src/modules/m_spanningtree/resolvers.h
@@ -21,24 +21,25 @@
 #pragma once
 
 #include "inspircd.h"
+#include "modules/dns.h"
 
 #include "utils.h"
 #include "link.h"
 
 /** Handle resolving of server IPs for the cache
  */
-class SecurityIPResolver : public Resolver
+class SecurityIPResolver : public DNS::Request
 {
  private:
 	reference<Link> MyLink;
 	SpanningTreeUtilities* Utils;
 	Module* mine;
 	std::string host;
-	QueryType query;
+	DNS::QueryType query;
  public:
-	SecurityIPResolver(Module* me, SpanningTreeUtilities* U, const std::string &hostname, Link* x, bool &cached, QueryType qt);
-	void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached);
-	void OnError(ResolverError e, const std::string &errormessage);
+	SecurityIPResolver(Module* me, SpanningTreeUtilities* U, DNS::Manager *mgr, const std::string &hostname, Link* x, DNS::QueryType qt);
+	void OnLookupComplete(const DNS::Query *r);
+	void OnError(const DNS::Query *q);
 };
 
 /** This class is used to resolve server hostnames during /connect and autoconnect.
@@ -47,16 +48,16 @@ class SecurityIPResolver : public Resolver
  * callback to OnLookupComplete or OnError when completed. Once it has completed we
  * will have an IP address which we can then use to continue our connection.
  */
-class ServernameResolver : public Resolver
+class ServernameResolver : public DNS::Request
 {
  private:
 	SpanningTreeUtilities* Utils;
-	QueryType query;
+	DNS::QueryType query;
 	std::string host;
 	reference<Link> MyLink;
 	reference<Autoconnect> myautoconnect;
  public:
-	ServernameResolver(SpanningTreeUtilities* Util, const std::string &hostname, Link* x, bool &cached, QueryType qt, Autoconnect* myac);
-	void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached);
-	void OnError(ResolverError e, const std::string &errormessage);
+	ServernameResolver(SpanningTreeUtilities* Util, DNS::Manager *mgr, const std::string &hostname, Link* x, DNS::QueryType qt, Autoconnect* myac);
+	void OnLookupComplete(const DNS::Query *r);
+	void OnError(const DNS::Query *q);
 };
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 18e9d72b8..428ef7224 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -287,16 +287,16 @@ void SpanningTreeUtilities::RefreshIPCache()
 		bool ipvalid = irc::sockets::aptosa(L->IPAddr, L->Port, dummy);
 		if ((L->IPAddr == "*") || (ipvalid))
 			ValidIPs.push_back(L->IPAddr);
-		else
+		else if (this->Creator->DNS)
 		{
+			SecurityIPResolver* sr = new SecurityIPResolver(Creator, this, *this->Creator->DNS, L->IPAddr, L, DNS::QUERY_AAAA);
 			try
 			{
-				bool cached = false;
-				SecurityIPResolver* sr = new SecurityIPResolver(Creator, this, L->IPAddr, L, cached, DNS_QUERY_AAAA);
-				ServerInstance->AddResolver(sr, cached);
+				this->Creator->DNS->Process(sr);
 			}
-			catch (...)
+			catch (DNS::Exception &)
 			{
+				delete sr;
 			}
 		}
 	}