m_spanningtree Remove duplicate code for sending channel messages from RouteCommand()

[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 36c161287932e2ecb72ff3116a2eaeccd34774bd..345b62b099b3c9edb8872eff781d516ed95814cb 100644 (file)
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -23,6 +23,7 @@
 #pragma once
 
 #include "inspircd.h"
+#include "cachetimer.h"
 
 /* Foward declarations */
 class TreeServer;
@@ -32,13 +33,13 @@ class Autoconnect;
 class ModuleSpanningTree;
 class SpanningTreeUtilities;
 
+extern SpanningTreeUtilities* Utils;
+
 /* This hash_map holds the hash equivalent of the server
  * tree, used for rapid linear lookups.
  */
 typedef TR1NS::unordered_map<std::string, TreeServer*, irc::insensitive, irc::StrHashComp> server_hash;
 
-typedef std::set<TreeServer*> TreeServerList;
-
 /** Contains helper functions and variables for this module,
  * and keeps them out of the global namespace
  */
@@ -48,7 +49,11 @@ class SpanningTreeUtilities : public classbase
         */
        std::string ConstructLine(const std::string& prefix, const std::string& command, const parameterlist& params);
 
+       CacheRefreshTimer RefreshTimer;
+
  public:
+       typedef std::set<TreeSocket*> TreeSocketSet;
+
        /** Creator module
         */
        ModuleSpanningTree* Creator;
@@ -87,9 +92,6 @@ class SpanningTreeUtilities : public classbase
        /** 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;
        /** List of all outgoing sockets and their timeouts
         */
        std::map<TreeSocket*, std::pair<std::string, int> > timeoutlist;
@@ -124,7 +126,7 @@ class SpanningTreeUtilities : public classbase
         */
        ~SpanningTreeUtilities();
 
-       void RouteCommand(TreeServer*, const std::string&, const parameterlist&, User*);
+       void RouteCommand(TreeServer* origin, CommandBase* cmd, const parameterlist& parameters, User* user);
 
        /** Send a message from this server to one other local or remote
         */
@@ -132,19 +134,23 @@ class SpanningTreeUtilities : public classbase
 
        /** Send a message from this server to all but one other, local or remote
         */
-       bool DoOneToAllButSender(const std::string &prefix, const std::string &command, const parameterlist& params, const std::string& omit);
+       void DoOneToAllButSender(const std::string& prefix, const std::string& command, const parameterlist& params, TreeServer* omit);
 
        /** Send a message from this server to all others
         */
-       bool DoOneToMany(const std::string &prefix, const std::string &command, const parameterlist &params);
+       void DoOneToMany(const std::string &prefix, const std::string &command, const parameterlist &params);
 
        /** Read the spanningtree module's tags from the config file
         */
        void ReadConfiguration();
 
+       /** Handle nick collision
+        */
+       int DoCollision(User* u, TreeServer* server, time_t remotets, const std::string& remoteident, const std::string& remoteip, const std::string& remoteuid);
+
        /** Compile a list of servers which contain members of channel c
         */
-       void GetListOfServersForChannel(Channel* c, TreeServerList &list, char status, const CUList &exempt_list);
+       void GetListOfServersForChannel(Channel* c, TreeSocketSet& list, char status, const CUList& exempt_list);
 
        /** Find a server by name
         */
@@ -172,5 +178,10 @@ class SpanningTreeUtilities : public classbase
 
        /** Sends a PRIVMSG or a NOTICE to a channel obeying an exempt list and an optional prefix
         */
-       void SendChannelMessage(const std::string& prefix, Channel* target, const std::string &text, char status, const CUList& exempt_list, const char* message_type);
+       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)
+{
+       DoOneToAllButSender(prefix, command, params, NULL);
+}