X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fprotocolinterface.cpp;h=56b9370ad9692da44a6777fe3995e7cbe622a7af;hb=d4aab8d30a4721623ccb02d7bb801dfe271f8e36;hp=cc015ff4a81de3242e11e63d5f2b70eda91c80f7;hpb=02220d48eec4dd3507b582031de639c9d7835ec8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index cc015ff4a..56b9370ad 100644
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -38,22 +38,48 @@ void SpanningTreeProtocolInterface::GetServerList(ServerList& sl)
 		ps.parentname = s ? s->GetName() : "";
 		ps.usercount = i->second->UserCount;
 		ps.opercount = i->second->OperCount;
-		ps.gecos = i->second->GetDesc();
+		ps.description = i->second->GetDesc();
 		ps.latencyms = i->second->rtt;
 		sl.push_back(ps);
 	}
 }
 
-bool SpanningTreeProtocolInterface::SendEncapsulatedData(const parameterlist &encap)
+bool SpanningTreeProtocolInterface::SendEncapsulatedData(const std::string& targetmask, const std::string& cmd, const CommandBase::Params& params, User* source)
 {
-	CmdBuilder params("ENCAP");
-	params.insert(encap);
-	if (encap[0].find_first_of("*?") != std::string::npos)
+	if (!source)
+		source = ServerInstance->FakeClient;
+
+	CmdBuilder encap(source, "ENCAP");
+
+	// Are there any wildcards in the target string?
+	if (targetmask.find_first_of("*?") != std::string::npos)
+	{
+		// Yes, send the target string as-is; servers will decide whether or not it matches them
+		encap.push(targetmask).push(cmd).insert(params).Broadcast();
+	}
+	else
 	{
-		params.Broadcast();
-		return true;
+		// No wildcards which means the target string has to be the name of a known server
+		TreeServer* server = Utils->FindServer(targetmask);
+		if (!server)
+			return false;
+
+		// Use the SID of the target in the message instead of the server name
+		encap.push(server->GetID()).push(cmd).insert(params).Unicast(server->ServerUser);
 	}
-	return params.Unicast(encap[0]);
+
+	return true;
+}
+
+void SpanningTreeProtocolInterface::BroadcastEncap(const std::string& cmd, const CommandBase::Params& params, User* source, User* omit)
+{
+	if (!source)
+		source = ServerInstance->FakeClient;
+
+	// If omit is non-NULL we pass the route belonging to the user to Forward(),
+	// otherwise we pass NULL, which is equivalent to Broadcast()
+	TreeServer* server = (omit ? TreeServer::Get(omit)->GetRoute() : NULL);
+	CmdBuilder(source, "ENCAP * ").push_raw(cmd).insert(params).Forward(server);
 }
 
 void SpanningTreeProtocolInterface::SendMetaData(User* u, const std::string& key, const std::string& data)
@@ -71,48 +97,22 @@ void SpanningTreeProtocolInterface::SendMetaData(const std::string& key, const s
 	CommandMetadata::Builder(key, data).Broadcast();
 }
 
-void SpanningTreeProtocolInterface::SendTopic(Channel* channel, std::string &topic)
+void SpanningTreeProtocolInterface::Server::SendMetaData(const std::string& key, const std::string& data)
 {
-	CommandFTopic::Builder(ServerInstance->FakeClient, channel).Broadcast();
+	sock->WriteLine(CommandMetadata::Builder(key, data));
 }
 
-void SpanningTreeProtocolInterface::SendMode(User* source, User* u, Channel* c, const std::vector<std::string>& modedata, const std::vector<TranslateType>& translate)
-{
-	if (u)
-	{
-		if (u->registered != REG_ALL)
-			return;
-
-		CmdBuilder params(source, "MODE");
-		params.push_back(u->uuid);
-		params.insert(modedata);
-		params.Broadcast();
-	}
-	else
-	{
-		CmdBuilder params(source, "FMODE");
-		params.push_back(c->name);
-		params.push_back(ConvToStr(c->age));
-		params.push_back(CommandParser::TranslateUIDs(translate, modedata));
-		params.Broadcast();
-	}
-}
-
-void SpanningTreeProtocolInterface::SendSNONotice(const std::string &snomask, const std::string &text)
+void SpanningTreeProtocolInterface::SendSNONotice(char snomask, const std::string &text)
 {
 	CmdBuilder("SNONOTICE").push(snomask).push_last(text).Broadcast();
 }
 
-void SpanningTreeProtocolInterface::PushToClient(User* target, const std::string &rawline)
-{
-	CmdBuilder("PUSH").push(target->uuid).push_last(rawline).Unicast(target);
-}
-
 void SpanningTreeProtocolInterface::SendMessage(Channel* target, char status, const std::string& text, MessageType msgtype)
 {
 	const char* cmd = (msgtype == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE");
 	CUList exempt_list;
-	Utils->SendChannelMessage(ServerInstance->Config->GetSID(), target, text, status, exempt_list, cmd);
+	ClientProtocol::TagMap tags;
+	Utils->SendChannelMessage(ServerInstance->Config->GetSID(), target, text, status, tags, exempt_list, cmd);
 }
 
 void SpanningTreeProtocolInterface::SendMessage(User* target, const std::string& text, MessageType msgtype)