X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fresolvers.cpp;h=80e8aeb0e23db5d373486ac2d2db64ae7bdd6eb8;hb=02220d48eec4dd3507b582031de639c9d7835ec8;hp=a7ad9767842e2e1084cb2712be4b9a8a69197d3d;hpb=27f046550c96714bc78a5e1499431da17c24408a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp
index a7ad97678..80e8aeb0e 100644
--- a/src/modules/m_spanningtree/resolvers.cpp
+++ b/src/modules/m_spanningtree/resolvers.cpp
@@ -28,16 +28,15 @@
 #include "link.h"
 #include "treesocket.h"
 
-/* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
-
 /** This class is used to resolve server hostnames during /connect and autoconnect.
  * As of 1.1, the resolver system is seperated out from BufferedSocket, so we must do this
  * resolver step first ourselves if we need it. This is totally nonblocking, and will
  * 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, 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)
+ServernameResolver::ServernameResolver(DNS::Manager* mgr, const std::string& hostname, Link* x, DNS::QueryType qt, Autoconnect* myac)
+	: DNS::Request(mgr, Utils->Creator, hostname, qt)
+	, query(qt), host(hostname), MyLink(x), myautoconnect(myac)
 {
 }
 
@@ -52,7 +51,7 @@ void ServernameResolver::OnLookupComplete(const DNS::Query *r)
 	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, ans_record.rdata);
+		TreeSocket* newsocket = new TreeSocket(MyLink, myautoconnect, ans_record.rdata);
 		if (newsocket->GetFd() > -1)
 		{
 			/* We're all OK */
@@ -72,7 +71,7 @@ void ServernameResolver::OnError(const DNS::Query *r)
 	/* Ooops! */
 	if (query == DNS::QUERY_AAAA)
 	{
-		ServernameResolver* snr = new ServernameResolver(Utils, this->manager, host, MyLink, DNS::QUERY_A, myautoconnect);
+		ServernameResolver* snr = new ServernameResolver(this->manager, host, MyLink, DNS::QUERY_A, myautoconnect);
 		try
 		{
 			this->manager->Process(snr);
@@ -88,8 +87,9 @@ void ServernameResolver::OnError(const DNS::Query *r)
 	Utils->Creator->ConnectServer(myautoconnect, false);
 }
 
-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)
+SecurityIPResolver::SecurityIPResolver(Module* me, DNS::Manager* mgr, const std::string& hostname, Link* x, DNS::QueryType qt)
+	: DNS::Request(mgr, me, hostname, qt)
+	, MyLink(x), mine(me), host(hostname), query(qt)
 {
 }
 
@@ -112,7 +112,7 @@ void SecurityIPResolver::OnError(const DNS::Query *r)
 {
 	if (query == DNS::QUERY_AAAA)
 	{
-		SecurityIPResolver* res = new SecurityIPResolver(mine, Utils, this->manager, host, MyLink, DNS::QUERY_A);
+		SecurityIPResolver* res = new SecurityIPResolver(mine, this->manager, host, MyLink, DNS::QUERY_A);
 		try
 		{
 			this->manager->Process(res);
@@ -123,12 +123,12 @@ void SecurityIPResolver::OnError(const DNS::Query *r)
 			delete res;
 		}
 	}
-	ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Could not resolve IP associated with Link '%s': %s",
+	ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Could not resolve IP associated with Link '%s': %s",
 		MyLink->Name.c_str(), this->manager->GetErrorStr(r->error).c_str());
 }
 
-CacheRefreshTimer::CacheRefreshTimer(SpanningTreeUtilities* Util)
-	: Timer(3600, ServerInstance->Time(), true), Utils(Util)
+CacheRefreshTimer::CacheRefreshTimer()
+	: Timer(3600, ServerInstance->Time(), true)
 {
 }