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.h

diff --git a/src/modules/m_spanningtree/resolvers.h b/src/modules/m_spanningtree/resolvers.h
index 10cc6f3ca7bc0b819050f64d4e1eef16a5269778..552815ac04159bf5cf3f0f6479a41d445a4c52ab 100644 (file)
--- a/src/modules/m_spanningtree/resolvers.h
+++ b/src/modules/m_spanningtree/resolvers.h
@@ -1,15 +1,23 @@
+/*       +------------------------------------+
+ *       | 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.
+ *
+ * ---------------------------------------------------
+ */
+
 #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"
 
@@ -32,7 +40,7 @@ class SecurityIPResolver : public Resolver
        {
        }
 
-       void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
+       void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0)
        {
                Utils->ValidIPs.push_back(result);
        }
@@ -46,12 +54,12 @@ class SecurityIPResolver : public Resolver
                        ServerInstance->AddResolver(res, cached);
                        return;
                }
-               ServerInstance->Log(DEFAULT,"Could not resolve IP associated with Link '%s': %s",MyLink.Name.c_str(),errormessage.c_str());
+               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 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.
@@ -70,7 +78,7 @@ class ServernameResolver : public Resolver
        Module* mine;
  public:
         ServernameResolver(Module* me, SpanningTreeUtilities* Util, InspIRCd* Instance, const std::string &hostname, Link x, bool &cached, QueryType qt);
-        void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached);
+        void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0);
         void OnError(ResolverError e, const std::string &errormessage);
 };