X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.h;h=6ac6578511e13bbc5daa5aa8403d713868e80a37;hb=4d91c60d55e832c47253a586e9c9de219d24e851;hp=2fd3a6e196c77fe087a39d8f584b5b915d3c646f;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 2fd3a6e19..6ac657851 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -26,7 +26,7 @@ class SpanningTreeUtilities;
 /* This hash_map holds the hash equivalent of the server
  * tree, used for rapid linear lookups.
  */
-#ifdef WINDOWS
+#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED)
 	typedef nspace::hash_map<std::string, TreeServer*, nspace::hash_compare<std::string, std::less<std::string> > > server_hash;
 #else
 	#ifdef HASHCOMP_DEPRECATED
@@ -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;
@@ -97,6 +101,9 @@ class SpanningTreeUtilities : public classbase
 	/** This variable represents the root of the server tree
 	 */
 	TreeServer *TreeRoot;
+	/** Represents the server whose command we are processing
+	 */
+	FakeUser *ServerUser;
 	/** IPs allowed to link to us
 	 */
 	std::vector<std::string> ValidIPs;
@@ -146,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
 	 */