Header update: 2007 -> 2008

[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 1c94e264fecbdb8050074017717a168a7a73bffa..6fb8b3e6eb522d902a639a0b0d447494671c804b 100644 (file)
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -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 */
@@ -29,11 +25,15 @@ class ModuleSpanningTree;
 /* This hash_map holds the hash equivalent of the server
  * tree, used for rapid linear lookups.
  */
+#ifdef WINDOWS
+typedef nspace::hash_map<std::string, TreeServer*, nspace::hash_compare<string, less<string> > > server_hash;
+#else
 typedef nspace::hash_map<std::string, TreeServer*, nspace::hash<string>, irc::StrHashComp> server_hash;
+#endif
 
 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;
@@ -85,17 +85,15 @@ class SpanningTreeUtilities
        /** Hash of currently connected servers by name
         */
        server_hash serverlist;
+       /** Hash of currently known server ids
+        */
+       server_hash sidlist;
        /** Hash of servers currently bursting but not initialized as connected
         */
        std::map<irc::string,TreeSocket*> burstingserverlist;
        /** 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
@@ -119,6 +117,10 @@ class SpanningTreeUtilities
         */
        bool ChallengeResponse;
 
+       /** Ping frequency of server to server links
+        */
+       int PingFreq;
+
        /** Initialise utility class
         */
        SpanningTreeUtilities(InspIRCd* Instance, ModuleSpanningTree* Creator);
@@ -151,10 +153,13 @@ 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);
+       /** Find server by SID
+        */
+       TreeServer* FindServerID(const std::string &id);
        /** Find a remote bursting server by name
         */
        TreeServer* FindRemoteBurstServer(TreeServer* Server);
@@ -185,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