X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.cpp;h=f78b8d4c02498bebc3aef7d6b86b147de2b6503c;hb=b4599531f97a9e6207b6bb8d728d7523b6995523;hp=f42822daa5da65c43a2f8268fc249fe19a8c2dd7;hpb=780dda83ba3857bc3c330d4b5d38bb251a9d879b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index f42822daa..f78b8d4c0 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -28,12 +28,13 @@
 #include "treesocket.h"
 #include "resolvers.h"
 #include "commandbuilder.h"
+#include "modules/server.h"
 
 SpanningTreeUtilities* Utils = NULL;
 
 ModResult ModuleSpanningTree::OnAcceptConnection(int newsock, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
 {
-	if (from->bind_tag->getString("type") != "servers")
+	if (!stdalgo::string::equalsci(from->bind_tag->getString("type"), "servers"))
 		return MOD_RES_PASSTHRU;
 
 	std::string incomingip = client->addr();
@@ -144,6 +145,7 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeSocketSet
 			minrank = mh->GetPrefixRank();
 	}
 
+	TreeServer::ChildServers children = TreeRoot->GetChildren();
 	const Channel::MemberMap& ulist = c->GetUsers();
 	for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); ++i)
 	{
@@ -157,9 +159,22 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeSocketSet
 		{
 			TreeServer* best = TreeServer::Get(i->first);
 			list.insert(best->GetSocket());
+
+			TreeServer::ChildServers::iterator citer = std::find(children.begin(), children.end(), best);
+			if (citer != children.end())
+				children.erase(citer);
 		}
 	}
-	return;
+
+	// Check whether the servers which do not have users in the channel might need this message. This
+	// is used to keep the chanhistory module synchronised between servers.
+	for (TreeServer::ChildServers::const_iterator i = children.begin(); i != children.end(); ++i)
+	{
+		ModResult result;
+		FIRST_MOD_RESULT_CUSTOM(Creator->GetEventProvider(), ServerEventListener, OnBroadcastMessage, result, (c, *i));
+		if (result == MOD_RES_ALLOW)
+			list.insert((*i)->GetSocket());
+	}
 }
 
 void SpanningTreeUtilities::DoOneToAllButSender(const CmdBuilder& params, TreeServer* omitroute)
@@ -226,6 +241,7 @@ void SpanningTreeUtilities::ReadConfiguration()
 	ConfigTag* options = ServerInstance->Config->ConfValue("options");
 	FlatLinks = security->getBool("flatlinks");
 	HideULines = security->getBool("hideulines");
+	HideSplits = security->getBool("hidesplits");
 	AnnounceTSChange = options->getBool("announcets");
 	AllowOptCommon = options->getBool("allowmismatch");
 	quiet_bursts = ServerInstance->Config->ConfValue("performance")->getBool("quietbursts");
@@ -287,7 +303,7 @@ void SpanningTreeUtilities::ReadConfiguration()
 			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Configuration warning: Link block '" + L->Name + "' has no IP defined! This will allow any IP to connect as this server, and MAY not be what you want.");
 		}
 
-		if (!L->Port)
+		if (!L->Port && L->IPAddr.find('/') == std::string::npos)
 			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Configuration warning: Link block '" + L->Name + "' has no port defined, you will not be able to /connect it.");
 
 		L->Fingerprint.erase(std::remove(L->Fingerprint.begin(), L->Fingerprint.end(), ':'), L->Fingerprint.end());
@@ -336,13 +352,16 @@ Link* SpanningTreeUtilities::FindLink(const std::string& name)
 	return NULL;
 }
 
-void SpanningTreeUtilities::SendChannelMessage(const std::string& prefix, Channel* target, const std::string& text, char status, const CUList& exempt_list, const char* message_type, TreeSocket* omit)
+void SpanningTreeUtilities::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)
 {
 	CmdBuilder msg(prefix, message_type);
+	msg.push_tags(tags);
 	msg.push_raw(' ');
 	if (status != 0)
 		msg.push_raw(status);
-	msg.push_raw(target->name).push_last(text);
+	msg.push_raw(target->name);
+	if (!text.empty())
+		msg.push_last(text);
 
 	TreeSocketSet list;
 	this->GetListOfServersForChannel(target, list, status, exempt_list);