Quiet bursts for uplinks, suggested by HiroP, thanks!

[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 c824b75edc20f49f996dbd825bd9bc21c819cdcf..5e9555deac3ea6c2dfec6884f0f75d2bf45d7cd7 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-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -21,16 +21,37 @@ class TreeServer;
 class TreeSocket;
 class Link;
 class ModuleSpanningTree;
+class SpanningTreeUtilities;
 
 /* 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<std::string, std::less<std::string> > > server_hash;
+       typedef nspace::hash_map<std::string, TreeServer*, nspace::hash_compare<std::string, std::less<std::string> > > server_hash;
 #else
-typedef nspace::hash_map<std::string, TreeServer*, nspace::hash<std::string>, irc::StrHashComp> server_hash;
+       #ifdef HASHCOMP_DEPRECATED
+               typedef nspace::hash_map<std::string, TreeServer*, nspace::insensitive, irc::StrHashComp> server_hash;
+       #else
+               typedef nspace::hash_map<std::string, TreeServer*, nspace::hash<std::string>, irc::StrHashComp> server_hash;
+       #endif
 #endif
 
+/*
+ * Initialises server connections
+ */
+class ServerSocketListener : public ListenSocketBase
+{
+       SpanningTreeUtilities *Utils;
+
+ public:
+       ServerSocketListener(InspIRCd* Instance, SpanningTreeUtilities *u, int port, char* addr) : ListenSocketBase(Instance, port, addr)
+       {
+               this->Utils = u;
+       }
+
+       virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip);
+};
+
 typedef std::map<TreeServer*,TreeServer*> TreeServerList;
 
 /** A group of modules that implement BufferedSocketHook
@@ -41,7 +62,7 @@ typedef std::map<irc::string, Module*> hookmodules;
 /** Contains helper functions and variables for this module,
  * and keeps them out of the global namespace
  */
-class SpanningTreeUtilities
+class SpanningTreeUtilities : public classbase
 {
  private:
        /** Creator server
@@ -65,9 +86,10 @@ class SpanningTreeUtilities
        /** Make snomasks +CQ quiet during bursts and splits
         */
        bool quiet_bursts;
+
        /** Socket bindings for listening sockets
         */
-       std::vector<TreeSocket*> Bindings;
+       std::vector<ServerSocketListener *> Bindings;
        /* Number of seconds that a server can go without ping
         * before opers are warned of high latency.
         */
@@ -87,6 +109,9 @@ class SpanningTreeUtilities
        /** Hash of servers currently bursting but not initialized as connected
         */
        std::map<irc::string,TreeSocket*> burstingserverlist;
+       /** List of all outgoing sockets and their timeouts
+        */
+       std::map<TreeSocket*, std::pair<std::string, int> > timeoutlist;
        /** Holds the data from the <link> tags in the conf
         */
        std::vector<Link> LinkBlocks;