X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_spanningtree%2Futils.cpp;h=a18ec854ddbcc79cfcfa96641dfc9f92ccefec39;hb=f6b33a8facd6ca200292786c1061782c41cdd278;hp=1224b1cf45d5a0316cbc5aecd5532862be9643b6;hpb=d7dd8d193c2e6176e97ec182d65b6ba1d0800aa5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 1224b1cf4..a18ec854d 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -258,13 +258,12 @@ void SpanningTreeUtilities::ReadConfiguration()
 	{
 		ConfigTag* tag = i->second;
 		reference<Link> L = new Link(tag);
-		std::string linkname = tag->getString("name");
-		L->Name = linkname.c_str();
 
 		irc::spacesepstream sep = tag->getString("allowmask");
 		for (std::string s; sep.GetToken(s);)
 			L->AllowMasks.push_back(s);
 
+		L->Name = tag->getString("name");
 		L->IPAddr = tag->getString("ipaddr");
 		L->Port = tag->getUInt("port", 0);
 		L->SendPass = tag->getString("sendpass", tag->getString("password"));
@@ -303,7 +302,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());
@@ -352,13 +351,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);