X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.h;h=495b0941401fe4c1a869e4354adc68d3029f05c4;hb=384ef31bc01e4a1a2e59d082c9066002410ba54a;hp=5aa8e925ec743eac983a1337fbcb0e9e11a551d7;hpb=06bc8df45045a3d1fdc45f793abf7ba72b7403b1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 5aa8e925e..495b09414 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -48,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
 	 */
@@ -75,7 +75,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;
@@ -100,7 +100,7 @@ class SpanningTreeUtilities : public classbase
 
 	/** Ping frequency of server to server links
 	 */
-	int PingFreq;
+	unsigned int PingFreq;
 
 	/** Initialise utility class
 	 */
@@ -108,17 +108,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
@@ -135,7 +134,7 @@ 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
 	 */
@@ -149,9 +148,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
 	 */