m_spanningtree Assign an id to new Memberships

[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 345b62b099b3c9edb8872eff781d516ed95814cb..bc2ea24a1a3d87b7b301472b8c407589ae93cd82 100644 (file)
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -32,6 +32,7 @@ class Link;
 class Autoconnect;
 class ModuleSpanningTree;
 class SpanningTreeUtilities;
+class CmdBuilder;
 
 extern SpanningTreeUtilities* Utils;
 
@@ -45,14 +46,11 @@ typedef TR1NS::unordered_map<std::string, TreeServer*, irc::insensitive, irc::St
  */
 class SpanningTreeUtilities : public classbase
 {
-       /** Creates a line in the :<prefix> <command> [<params>] format
-        */
-       std::string ConstructLine(const std::string& prefix, const std::string& command, const parameterlist& params);
-
        CacheRefreshTimer RefreshTimer;
 
  public:
        typedef std::set<TreeSocket*> TreeSocketSet;
+       typedef std::map<TreeSocket*, std::pair<std::string, int> > TimeoutList;
 
        /** Creator module
         */
@@ -94,7 +92,7 @@ class SpanningTreeUtilities : public classbase
        server_hash sidlist;
        /** List of all outgoing sockets and their timeouts
         */
-       std::map<TreeSocket*, std::pair<std::string, int> > timeoutlist;
+       TimeoutList timeoutlist;
        /** Holds the data from the <link> tags in the conf
         */
        std::vector<reference<Link> > LinkBlocks;
@@ -102,14 +100,6 @@ class SpanningTreeUtilities : public classbase
         */
        std::vector<reference<Autoconnect> > AutoconnectBlocks;
 
-       /** True (default) if we are to use challenge-response HMAC
-        * to authenticate passwords.
-        *
-        * NOTE: This defaults to on, but should be turned off if
-        * you are linking to an older version of inspircd.
-        */
-       bool ChallengeResponse;
-
        /** Ping frequency of server to server links
         */
        int PingFreq;
@@ -130,15 +120,16 @@ class SpanningTreeUtilities : public classbase
 
        /** Send a message from this server to one other local or remote
         */
-       bool DoOneToOne(const std::string& prefix, const std::string& command, const parameterlist& params, const std::string& target);
+       bool DoOneToOne(const CmdBuilder& params, const std::string& target);
+       void DoOneToOne(const CmdBuilder& params, Server* target);
 
        /** Send a message from this server to all but one other, local or remote
         */
-       void DoOneToAllButSender(const std::string& prefix, const std::string& command, const parameterlist& params, TreeServer* omit);
+       void DoOneToAllButSender(const CmdBuilder& params, TreeServer* omit);
 
        /** Send a message from this server to all others
         */
-       void DoOneToMany(const std::string &prefix, const std::string &command, const parameterlist &params);
+       void DoOneToMany(const CmdBuilder& params);
 
        /** Read the spanningtree module's tags from the config file
         */
@@ -181,7 +172,7 @@ class SpanningTreeUtilities : public classbase
        void SendChannelMessage(const std::string& prefix, Channel* target, const std::string& text, char status, const CUList& exempt_list, const char* message_type, TreeSocket* omit = NULL);
 };
 
-inline void SpanningTreeUtilities::DoOneToMany(const std::string& prefix, const std::string& command, const parameterlist& params)
+inline void SpanningTreeUtilities::DoOneToMany(const CmdBuilder& params)
 {
-       DoOneToAllButSender(prefix, command, params, NULL);
+       DoOneToAllButSender(params, NULL);
 }