Fix a lot of calls to match() and uses of wildcard.h (which doesn't exist anymore...

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / resolvers.cpp

diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp
index 360ed2d52a221acc715c991231f48b694cf78258..3ea6e2bdf1b0b0e0ff3a9bf5b6da4113a0191901 100644 (file)
--- a/src/modules/m_spanningtree/resolvers.cpp
+++ b/src/modules/m_spanningtree/resolvers.cpp
@@ -1,12 +1,20 @@
-#include "configreader.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.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"
 
@@ -17,21 +25,26 @@
 #include "m_spanningtree/link.h"
 #include "m_spanningtree/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 InspSocket, so we must do this
+ * 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(Module* me, SpanningTreeUtilities* Util, InspIRCd* Instance, const std::string &hostname, Link x, bool &cached) : Resolver(Instance, hostname, DNS_QUERY_FORWARD, cached, me), MyLink(x), Utils(Util)
+ServernameResolver::ServernameResolver(Module* me, SpanningTreeUtilities* Util, InspIRCd* Instance, const std::string &hostname, Link x, bool &cached, QueryType qt) : Resolver(Instance, hostname, qt, cached, me), MyLink(x), Utils(Util), query(qt), host(hostname), mine(me)
 {
        /* Nothing in here, folks */
 }
 
-void ServernameResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
+void ServernameResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum)
 {
+       if (resultnum)
+               return;
+
        /* Initiate the connection, now that we have an IP to use.
-        * Passing a hostname directly to InspSocket causes it to
+        * Passing a hostname directly to BufferedSocket causes it to
         * just bail and set its FD to -1.
         */
        TreeServer* CheckDupe = Utils->FindServer(MyLink.Name.c_str());
@@ -42,7 +55,7 @@ void ServernameResolver::OnLookupComplete(const std::string &result, unsigned in
                        return;
 
                TreeSocket* newsocket = new TreeSocket(this->Utils, ServerInstance, result,MyLink.Port,false,MyLink.Timeout ? MyLink.Timeout : 10,MyLink.Name.c_str(),
-                               MyLink.Hook.empty() ? NULL : Utils->hooks[MyLink.Hook.c_str()]);
+                                                       MyLink.Bind, MyLink.Hook.empty() ? NULL : Utils->hooks[MyLink.Hook.c_str()]);
                if (newsocket->GetFd() > -1)
                {
                        /* We're all OK */
@@ -50,8 +63,9 @@ void ServernameResolver::OnLookupComplete(const std::string &result, unsigned in
                else
                {
                        /* Something barfed, show the opers */
-                       ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002: %s.",MyLink.Name.c_str(),strerror(errno));
-                       delete newsocket;
+                       Utils->Creator->RemoteMessage(NULL, "CONNECT: Error connecting \002%s\002: %s.",MyLink.Name.c_str(),strerror(errno));
+                       if (ServerInstance->SocketCull.find(newsocket) == ServerInstance->SocketCull.end())
+                               ServerInstance->SocketCull[newsocket] = newsocket;
                        Utils->DoFailOver(&MyLink);
                }
        }
@@ -60,7 +74,14 @@ void ServernameResolver::OnLookupComplete(const std::string &result, unsigned in
 void ServernameResolver::OnError(ResolverError e, const std::string &errormessage)
 {
        /* Ooops! */
-       ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002: Unable to resolve hostname - %s",MyLink.Name.c_str(),errormessage.c_str());
+       if (query == DNS_QUERY_AAAA)
+       {
+               bool cached;
+               ServernameResolver* snr = new ServernameResolver(mine, Utils, ServerInstance, host, MyLink, cached, DNS_QUERY_A);
+               ServerInstance->AddResolver(snr, cached);
+               return;
+       }
+       Utils->Creator->RemoteMessage(NULL, "CONNECT: Error connecting \002%s\002: Unable to resolve hostname - %s", MyLink.Name.c_str(), errormessage.c_str() );
        Utils->DoFailOver(&MyLink);
 }