X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fresolvers.h;h=5d4386c4b2c276f5931fb34d244e292da27aafc8;hb=dbf4d595433ecefeb61f1267ffa515a91c3ab548;hp=dd7a9a21564daa16c1d7daa89d63017e6ce1a532;hpb=bf65e9dc25b9e52dc1f84a6e24157bdaf8d39d5c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/resolvers.h b/src/modules/m_spanningtree/resolvers.h
index dd7a9a215..5d4386c4b 100644
--- a/src/modules/m_spanningtree/resolvers.h
+++ b/src/modules/m_spanningtree/resolvers.h
@@ -1,43 +1,79 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #ifndef __RESOLVERS__H__
 #define __RESOLVERS__H__
 
-#include "configreader.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
 #include "socket.h"
 #include "inspircd.h"
-#include "wildcard.h"
 #include "xline.h"
-#include "transport.h"
 
-#include "m_spanningtree/utils.h"
+#include "utils.h"
+#include "link.h"
 
 /** Handle resolving of server IPs for the cache
  */
 class SecurityIPResolver : public Resolver
 {
  private:
-        Link MyLink;
-        SpanningTreeUtilities* Utils;
+	reference<Link> MyLink;
+	SpanningTreeUtilities* Utils;
+	Module* mine;
+	std::string host;
+	QueryType query;
+ public:
+	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)
+	{
+	}
+
+	void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
+	{
+		Utils->ValidIPs.push_back(result);
+	}
+
+	void OnError(ResolverError e, const std::string &errormessage)
+	{
+		if (query == DNS_QUERY_AAAA)
+		{
+			bool cached;
+			SecurityIPResolver* res = new SecurityIPResolver(mine, Utils, host, MyLink, cached, DNS_QUERY_A);
+			ServerInstance->AddResolver(res, cached);
+			return;
+		}
+		ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Could not resolve IP associated with Link '%s': %s",
+			MyLink->Name.c_str(),errormessage.c_str());
+	}
+};
+
+/** 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.
+ */
+class ServernameResolver : public Resolver
+{
+ private:
+	SpanningTreeUtilities* Utils;
+	QueryType query;
+	std::string host;
+	reference<Link> MyLink;
+	reference<Autoconnect> myautoconnect;
  public:
-        SecurityIPResolver(Module* me, SpanningTreeUtilities* U, InspIRCd* Instance, const std::string &hostname, Link x, bool &cached) : Resolver(Instance, hostname, DNS_QUERY_FORWARD, cached, me), 
-MyLink(x),
- Utils(U)
-        {
-        }
-
-        void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
-        {
-                Utils->ValidIPs.push_back(result);
-        }
-
-        void OnError(ResolverError e, const std::string &errormessage)
-        {
-                ServerInstance->Log(DEFAULT,"Could not resolve IP associated with Link '%s': %s",MyLink.Name.c_str(),errormessage.c_str());
-        }
+	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);
 };
 
 #endif