X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fresolvers.h;h=782ac86efeebfa47172d860044aafe4ef7499066;hb=8320bcc9df1ea89a47257c9f9c70aa6d476beaa8;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..782ac86ef 100644
--- a/src/modules/m_spanningtree/resolvers.h
+++ b/src/modules/m_spanningtree/resolvers.h
@@ -1,43 +1,61 @@
-#ifndef __RESOLVERS__H__
-#define __RESOLVERS__H__
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#pragma once
 
-#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 "modules/dns.h"
 
-#include "m_spanningtree/utils.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:
-        Link MyLink;
-        SpanningTreeUtilities* Utils;
+	reference<Link> MyLink;
+	Module* mine;
+	std::string host;
+	DNS::QueryType query;
  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());
-        }
+	SecurityIPResolver(Module* me, DNS::Manager* mgr, const std::string& hostname, Link* x, DNS::QueryType qt);
+	void OnLookupComplete(const DNS::Query *r) CXX11_OVERRIDE;
+	void OnError(const DNS::Query *q) CXX11_OVERRIDE;
 };
 
-#endif
+/** 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 DNS::Request
+{
+ private:
+	DNS::QueryType query;
+	std::string host;
+	reference<Link> MyLink;
+	reference<Autoconnect> myautoconnect;
+ public:
+	ServernameResolver(DNS::Manager* mgr, const std::string& hostname, Link* x, DNS::QueryType qt, Autoconnect* myac);
+	void OnLookupComplete(const DNS::Query *r) CXX11_OVERRIDE;
+	void OnError(const DNS::Query *q) CXX11_OVERRIDE;
+};