From 8428bbb387d4b1195156f0ab5a676d17b69b8d5f Mon Sep 17 00:00:00 2001
From: Adam
Date: Mon, 22 Apr 2013 05:21:38 +0200
Subject: Modularize DNS

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

Thanks to Attila for helping with much of this.
---
 src/modules/m_spanningtree/main.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/modules/m_spanningtree/main.cpp')

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);
 		}
-- 
cgit v1.3.1-10-gc9f91