Make classbase and refcountbase uncopyable; expand comments on their indended uses

[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 a32b5a445f69b7d3062d065307aa65733787715c..2fc7304af7e4df3102bd8f52361063a905f78c6a 100644 (file)
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -20,6 +20,7 @@
 class TreeServer;
 class TreeSocket;
 class Link;
+class Autoconnect;
 class ModuleSpanningTree;
 class SpanningTreeUtilities;
 
@@ -44,30 +45,21 @@ class ServerSocketListener : public ListenSocketBase
        SpanningTreeUtilities *Utils;
 
  public:
-       ServerSocketListener(InspIRCd* Instance, SpanningTreeUtilities *u, int port, char* addr) : ListenSocketBase(Instance, port, addr)
+       ServerSocketListener(SpanningTreeUtilities *u, int port, const std::string& addr, const std::string& Hook)
+               : ListenSocketBase(port, addr, "servers", Hook), Utils(u)
        {
-               this->Utils = u;
        }
 
-       virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip);
+       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;
-
 /** Contains helper functions and variables for this module,
  * and keeps them out of the global namespace
  */
 class SpanningTreeUtilities : public classbase
 {
- private:
-       /** Creator server
-        */
-       InspIRCd* ServerInstance;
  public:
        /** Creator module
         */
@@ -83,13 +75,14 @@ class SpanningTreeUtilities : public classbase
         */
        bool AnnounceTSChange;
 
+       /** Allow modules marked as VF_OPTCOMMON to be mismatched when linking
+        */
+       bool AllowOptCommon;
+
        /** Make snomasks +CQ quiet during bursts and splits
         */
        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.
         */
@@ -117,15 +110,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;
-
-       /** List of module pointers which can provide I/O abstraction
-        */
-       hookmodules hooks;
-
-       /** List of module names which can provide I/O abstraction
+       std::vector<reference<Link> > LinkBlocks;
+       /** Holds the data from the <autoconnect> tags in the conf
         */
-       std::vector<std::string> hooknames;
+       std::vector<reference<Autoconnect> > AutoconnectBlocks;
 
        /** True (default) if we are to use challenge-response HMAC
         * to authenticate passwords.
@@ -141,35 +129,41 @@ class SpanningTreeUtilities : public classbase
 
        /** Initialise utility class
         */
-       SpanningTreeUtilities(InspIRCd* Instance, ModuleSpanningTree* Creator);
+       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, std::deque<std::string> &params, std::string target);
+       bool DoOneToOne(const std::string &prefix, const std::string &command, parameterlist &params, std::string target);
 
        /** Send a message from this server to all but one other, local or remote
         */
-       bool DoOneToAllButSender(const std::string &prefix, const std::string &command, std::deque<std::string> &params, std::string omit);
+       bool DoOneToAllButSender(const std::string &prefix, const std::string &command, parameterlist &params, std::string omit);
 
        /** Send a message from this server to all but one other, local or remote
         */
-       bool DoOneToAllButSender(const char* prefix, const char* command, std::deque<std::string> &params, std::string omit);
+       bool DoOneToAllButSender(const char* prefix, const char* command, parameterlist &params, std::string omit);
 
        /** Send a message from this server to all others
         */
-       bool DoOneToMany(const std::string &prefix, const std::string &command, std::deque<std::string> &params);
+       bool DoOneToMany(const std::string &prefix, const std::string &command, parameterlist &params);
 
        /** Send a message from this server to all others
         */
-       bool DoOneToMany(const char* prefix, const char* command, std::deque<std::string> &params);
+       bool DoOneToMany(const char* prefix, const char* command, parameterlist &params);
 
        /** Send a message from this server to all others, without doing any processing on the command (e.g. send it as-is with colons and all)
         */
-       bool DoOneToAllButSenderRaw(const std::string &data, const std::string &omit, const std::string &prefix, const irc::string &command, std::deque<std::string> &params);
+       bool DoOneToAllButSenderRaw(const std::string &data, const std::string &omit, const std::string &prefix, const irc::string &command, parameterlist &params);
 
        /** Read the spanningtree module's tags from the config file
         */
@@ -203,10 +197,6 @@ class SpanningTreeUtilities : public classbase
         */
        bool IsServer(const std::string &ServerName);
 
-       /** Attempt to connect to the failover link of link x
-        */
-       void DoFailOver(Link* x);
-
        /** Find a link tag from a server name
         */
        Link* FindLink(const std::string& name);