Replace ModuleSpanningTree::TimeToStr with InspIRCd::DurationStr.

[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 3a419e2a40b304b4a58ad5e6f79a21dd3064b62e..c6f5822fe715cd7a97de1eb5ddbe5285014c2f96 100644 (file)
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -25,7 +25,6 @@
 #include "inspircd.h"
 #include "cachetimer.h"
 
-/* Foward declarations */
 class TreeServer;
 class TreeSocket;
 class Link;
@@ -36,8 +35,7 @@ class CmdBuilder;
 
 extern SpanningTreeUtilities* Utils;
 
-/* This hash_map holds the hash equivalent of the server
- * tree, used for rapid linear lookups.
+/** Associative container type, mapping server names/ids to TreeServers
  */
 typedef TR1NS::unordered_map<std::string, TreeServer*, irc::insensitive, irc::StrHashComp> server_hash;
 
@@ -50,7 +48,7 @@ class SpanningTreeUtilities : public classbase
 
  public:
        typedef std::set<TreeSocket*> TreeSocketSet;
-       typedef std::map<TreeSocket*, std::pair<std::string, int> > TimeoutList;
+       typedef std::map<TreeSocket*, std::pair<std::string, unsigned int> > TimeoutList;
 
        /** Creator module
         */
@@ -59,6 +57,11 @@ class SpanningTreeUtilities : public classbase
        /** Flatten links and /MAP for non-opers
         */
        bool FlatLinks;
+
+       /** True if we're going to hide netsplits as *.net *.split for non-opers
+        */
+       bool HideSplits;
+
        /** Hide U-Lined servers in /MAP and /LINKS
         */
        bool HideULines;
@@ -77,7 +80,7 @@ class SpanningTreeUtilities : public classbase
        /* Number of seconds that a server can go without ping
         * before opers are warned of high latency.
         */
-       int PingWarnTime;
+       unsigned int PingWarnTime;
        /** This variable represents the root of the server tree
         */
        TreeServer *TreeRoot;
@@ -102,7 +105,7 @@ class SpanningTreeUtilities : public classbase
 
        /** Ping frequency of server to server links
         */
-       int PingFreq;
+       unsigned int PingFreq;
 
        /** Initialise utility class
         */
@@ -110,17 +113,16 @@ class SpanningTreeUtilities : public classbase
 
        /** Prepare for class destruction
         */
-       CullResult cull();
+       CullResult cull() CXX11_OVERRIDE;
 
        /** Destroy class and free listeners etc
         */
        ~SpanningTreeUtilities();
 
-       void RouteCommand(TreeServer* origin, CommandBase* cmd, const parameterlist& parameters, User* user);
+       void RouteCommand(TreeServer* origin, CommandBase* cmd, const CommandBase::Params& parameters, User* user);
 
        /** Send a message from this server to one other local or remote
         */
-       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
@@ -137,13 +139,13 @@ class SpanningTreeUtilities : public classbase
 
        /** Handle nick collision
         */
-       bool DoCollision(User* u, TreeServer* server, time_t remotets, const std::string& remoteident, const std::string& remoteip, const std::string& remoteuid);
+       bool DoCollision(User* u, TreeServer* server, time_t remotets, const std::string& remoteident, const std::string& remoteip, const std::string& remoteuid, const char* collidecmd);
 
        /** Compile a list of servers which contain members of channel c
         */
        void GetListOfServersForChannel(Channel* c, TreeSocketSet& list, char status, const CUList& exempt_list);
 
-       /** Find a server by name
+       /** Find a server by name or SID
         */
        TreeServer* FindServer(const std::string &ServerName);
 
@@ -151,9 +153,10 @@ class SpanningTreeUtilities : public classbase
         */
        TreeServer* FindServerID(const std::string &id);
 
-       /** Find a route to a server by name
+       /** Find a server based on a target string.
+        * @param target Target string where a command should be routed to. May be a server name, a sid, a nickname or a uuid.
         */
-       TreeServer* BestRouteTo(const std::string &ServerName);
+       TreeServer* FindRouteTarget(const std::string& target);
 
        /** Find a server by glob mask
         */
@@ -169,7 +172,7 @@ 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, TreeSocket* omit = NULL);
+       void SendChannelMessage(const std::string& prefix, Channel* target, const std::string& text, char status, const ClientProtocol::TagMap& tags, const CUList& exempt_list, const char* message_type, TreeSocket* omit = NULL);
 };
 
 inline void SpanningTreeUtilities::DoOneToMany(const CmdBuilder& params)