X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.h;h=6ac6578511e13bbc5daa5aa8403d713868e80a37;hb=63d3e056b742598f48ba9a8df216b06117a37910;hp=a32b5a445f69b7d3062d065307aa65733787715c;hpb=01ce98f2746be837a64f5f9ed2c36eeaabae7462;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index a32b5a445..6ac657851 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -49,7 +49,7 @@ class ServerSocketListener : public ListenSocketBase
 		this->Utils = u;
 	}
 
-	virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip);
+	virtual void OnAcceptReady(int nfd);
 };
 
 typedef std::map<TreeServer*,TreeServer*> TreeServerList;
@@ -83,6 +83,10 @@ class SpanningTreeUtilities : public classbase
 	 */
 	bool AnnounceTSChange;
 
+	/** Allow modules marked as VF_OPTCOMMON to be mismatched when linking
+	 */
+	bool AllowOptCommon;
+
 	/** Make snomasks +CQ quiet during bursts and splits
 	 */
 	bool quiet_bursts;
@@ -149,27 +153,27 @@ 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, std::deque<std::string> &params, std::string target);
+	bool DoOneToOne(const std::string &prefix, const std::string &command, parameterlist &params, std::string target);
 
 	/** Send a message from this server to all but one other, local or remote
 	 */
-	bool DoOneToAllButSender(const std::string &prefix, const std::string &command, std::deque<std::string> &params, std::string omit);
+	bool DoOneToAllButSender(const std::string &prefix, const std::string &command, parameterlist &params, std::string omit);
 
 	/** Send a message from this server to all but one other, local or remote
 	 */
-	bool DoOneToAllButSender(const char* prefix, const char* command, std::deque<std::string> &params, std::string omit);
+	bool DoOneToAllButSender(const char* prefix, const char* command, parameterlist &params, std::string omit);
 
 	/** Send a message from this server to all others
 	 */
-	bool DoOneToMany(const std::string &prefix, const std::string &command, std::deque<std::string> &params);
+	bool DoOneToMany(const std::string &prefix, const std::string &command, parameterlist &params);
 
 	/** Send a message from this server to all others
 	 */
-	bool DoOneToMany(const char* prefix, const char* command, std::deque<std::string> &params);
+	bool DoOneToMany(const char* prefix, const char* command, parameterlist &params);
 
 	/** Send a message from this server to all others, without doing any processing on the command (e.g. send it as-is with colons and all)
 	 */
-	bool DoOneToAllButSenderRaw(const std::string &data, const std::string &omit, const std::string &prefix, const irc::string &command, std::deque<std::string> &params);
+	bool DoOneToAllButSenderRaw(const std::string &data, const std::string &omit, const std::string &prefix, const irc::string &command, parameterlist &params);
 
 	/** Read the spanningtree module's tags from the config file
 	 */