Make misconfiguration of spanningtree more 'fatal' so we get less morons coming to...

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / utils.h

diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 10171418629b50f01bbee48695f091f992559072..d437b998b436c3400ea5483431ff331068744433 100644 (file)
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -14,10 +14,6 @@
 #ifndef __ST__UTIL__
 #define __ST__UTIL__
 
-#include "configreader.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* Foward declarations */
@@ -37,7 +33,7 @@ typedef nspace::hash_map<std::string, TreeServer*, nspace::hash<string>, irc::St
 
 typedef std::map<TreeServer*,TreeServer*> TreeServerList;
 
-/** A group of modules that implement InspSocketHook
+/** A group of modules that implement BufferedSocketHook
  * that we can use to hook our server to server connections.
  */
 typedef std::map<irc::string, Module*> hookmodules;
@@ -98,11 +94,6 @@ class SpanningTreeUtilities
        /** Holds the data from the <link> tags in the conf
         */
        std::vector<Link> LinkBlocks;
-       /** Holds a bitmask of queued xline types waiting to be applied.
-        * Will be a mask containing values APPLY_GLINES, APPLY_KLINES,
-        * APPLY_QLINES and APPLY_ZLINES.
-        */
-       int lines_to_apply;
 
        /** If this is true, this server is the master sync server for time
         * synching - e.g. it is the server with its clock correct. It will
@@ -162,7 +153,7 @@ class SpanningTreeUtilities
        void AddThisServer(TreeServer* server, TreeServerList &list);
        /** Compile a list of servers which contain members of channel c
         */
-       void GetListOfServersForChannel(chanrec* c, TreeServerList &list, char status, const CUList &exempt_list);
+       void GetListOfServersForChannel(Channel* c, TreeServerList &list, char status, const CUList &exempt_list);
        /** Find a server by name
         */
        TreeServer* FindServer(const std::string &ServerName);
@@ -199,6 +190,11 @@ class SpanningTreeUtilities
        void AddBurstingServer(const std::string &ServerName, TreeSocket* s);
 
        void DelBurstingServer(TreeSocket* s);
+
+       /** Return true if str looks like a server ID
+        * @param string to check against
+        */
+       bool IsSID(const std::string &str);
 };
 
 #endif