X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.h;h=4005f0db93c1d5c21865d5c4b7429bf0c2746238;hb=a8b146419b2aae36da25b7202292528efd3158a9;hp=491c4126f91ec3c16c8af516face90c03cb0061f;hpb=15f4e6b865de11299e7688f28415957737999e02;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 491c4126f..4005f0db9 100644
--- 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;
 
@@ -40,20 +41,17 @@ extern SpanningTreeUtilities* Utils;
  */
 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
  */
 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
 	 */
 	ModuleSpanningTree* Creator;
@@ -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;
@@ -130,15 +128,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
 	 */
@@ -150,7 +149,7 @@ class SpanningTreeUtilities : public classbase
 
 	/** 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
 	 */
@@ -178,10 +177,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)
+inline void SpanningTreeUtilities::DoOneToMany(const CmdBuilder& params)
 {
-	DoOneToAllButSender(prefix, command, params, NULL);
+	DoOneToAllButSender(params, NULL);
 }