Fix ENCAP stripping, was incorrectly checking for " CHGHOST" and similar commands

[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 2f8fc75dbd14a123cfacfb6aa243f8d4d1816607..eb0df03ffe22cbe5296ea2a1851b519fc00e5674 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-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -20,6 +20,7 @@
 class TreeServer;
 class TreeSocket;
 class Link;
+class Autoconnect;
 class ModuleSpanningTree;
 class SpanningTreeUtilities;
 
@@ -36,47 +37,8 @@ class SpanningTreeUtilities;
        #endif
 #endif
 
-/*
- * Initialises server connections
- */
-class ServerSocketListener : public ListenSocketBase
-{
-       SpanningTreeUtilities *Utils;
-
- public:
-       ServerSocketListener(SpanningTreeUtilities *u, int port, char* addr) : ListenSocketBase(port, addr)
-       {
-               this->Utils = u;
-               Hook = NULL;
-       }
-
-       Module* Hook;
-
-       virtual void OnAcceptReady(int nfd);
-};
-
 typedef std::map<TreeServer*,TreeServer*> TreeServerList;
 
-/** 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;
-
-/** The Autoconnect class might as well be a struct,
- * but this is C++ and we don't believe in structs (!).
- * It holds the entire information of one <autoconnect>
- * tag from the main config file. We maintain a list
- * of them, and populate the list on rehash/load.
- */
-class Autoconnect : public classbase
-{
- public:
-       unsigned long Period;
-       std::string Server;
-       time_t NextConnectTime;
-       std::string FailOver;
-};
-
 /** Contains helper functions and variables for this module,
  * and keeps them out of the global namespace
  */
@@ -105,9 +67,6 @@ class SpanningTreeUtilities : public classbase
         */
        bool quiet_bursts;
 
-       /** Socket bindings for listening sockets
-        */
-       std::vector<ServerSocketListener *> Bindings;
        /* Number of seconds that a server can go without ping
         * before opers are warned of high latency.
         */
@@ -115,9 +74,6 @@ class SpanningTreeUtilities : public classbase
        /** This variable represents the root of the server tree
         */
        TreeServer *TreeRoot;
-       /** Represents the server whose command we are processing
-        */
-       FakeUser *ServerUser;
        /** IPs allowed to link to us
         */
        std::vector<std::string> ValidIPs;
@@ -135,18 +91,10 @@ class SpanningTreeUtilities : public classbase
        std::map<TreeSocket*, std::pair<std::string, int> > timeoutlist;
        /** Holds the data from the <link> tags in the conf
         */
-       std::vector<Link> LinkBlocks;
+       std::vector<reference<Link> > LinkBlocks;
        /** Holds the data from the <autoconnect> tags in the conf
         */
-       std::vector<Autoconnect> AutoconnectBlocks;
-
-       /** List of module pointers which can provide I/O abstraction
-        */
-       hookmodules hooks;
-
-       /** List of module names which can provide I/O abstraction
-        */
-       std::vector<std::string> hooknames;
+       std::vector<reference<Autoconnect> > AutoconnectBlocks;
 
        /** True (default) if we are to use challenge-response HMAC
         * to authenticate passwords.
@@ -164,10 +112,16 @@ class SpanningTreeUtilities : public classbase
         */
        SpanningTreeUtilities(ModuleSpanningTree* Creator);
 
+       /** Prepare for class destruction
+        */
+       CullResult cull();
+
        /** Destroy class and free listeners etc
         */
        ~SpanningTreeUtilities();
 
+       void RouteCommand(TreeServer*, const std::string&, const parameterlist&, User*);
+
        /** Send a message from this server to one other local or remote
         */
        bool DoOneToOne(const std::string &prefix, const std::string &command, parameterlist &params, std::string target);
@@ -194,7 +148,7 @@ class SpanningTreeUtilities : public classbase
 
        /** Read the spanningtree module's tags from the config file
         */
-       void ReadConfiguration(bool rebind);
+       void ReadConfiguration();
 
        /** Add a server to the server list for GetListOfServersForChannel
         */
@@ -224,10 +178,6 @@ class SpanningTreeUtilities : public classbase
         */
        bool IsServer(const std::string &ServerName);
 
-       /** Attempt to connect to the failover link of link x
-        */
-       void DoFailOver(Autoconnect* x);
-
        /** Find a link tag from a server name
         */
        Link* FindLink(const std::string& name);