X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=b3cc78118037d35ca730b8d35ad81cad653e9aee;hb=cc74fb0be4ce4a5f55719dcf4b1045fe156ded1b;hp=59e17f88e3c70b716d8ed1baf4bec4c1d7858eed;hpb=d24619c012b34d5a3d4cfb93e7bea3ff3d5721e7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 59e17f88e..b3cc78118 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -36,15 +36,19 @@
 #include "protocolinterface.h"
 
 ModuleSpanningTree::ModuleSpanningTree()
-	: commands(NULL), DNS(this, "DNS"), Utils(NULL)
+	: rconnect(this), rsquit(this), map(this)
+	, commands(NULL), DNS(this, "DNS")
 {
 }
 
 SpanningTreeCommands::SpanningTreeCommands(ModuleSpanningTree* module)
-	: rconnect(module, module->Utils), rsquit(module, module->Utils),
-	svsjoin(module), svspart(module), svsnick(module), metadata(module),
+	: svsjoin(module), svspart(module), svsnick(module), metadata(module),
 	uid(module), opertype(module), fjoin(module), ijoin(module), resync(module),
-	fmode(module), ftopic(module), fhost(module), fident(module), fname(module)
+	fmode(module), ftopic(module), fhost(module), fident(module), fname(module),
+	away(module), addline(module), delline(module), encap(module), idle(module),
+	nick(module), ping(module), pong(module), push(module), save(module),
+	server(module), squit(module), snonotice(module), version(module),
+	burst(module), endburst(module)
 {
 }
 
@@ -53,26 +57,11 @@ void ModuleSpanningTree::init()
 	ServerInstance->SNO->EnableSnomask('l', "LINK");
 
 	Utils = new SpanningTreeUtilities(this);
+	Utils->TreeRoot = new TreeServer;
 	commands = new SpanningTreeCommands(this);
-	ServerInstance->Modules->AddService(commands->rconnect);
-	ServerInstance->Modules->AddService(commands->rsquit);
-	ServerInstance->Modules->AddService(commands->svsjoin);
-	ServerInstance->Modules->AddService(commands->svspart);
-	ServerInstance->Modules->AddService(commands->svsnick);
-	ServerInstance->Modules->AddService(commands->metadata);
-	ServerInstance->Modules->AddService(commands->uid);
-	ServerInstance->Modules->AddService(commands->opertype);
-	ServerInstance->Modules->AddService(commands->fjoin);
-	ServerInstance->Modules->AddService(commands->ijoin);
-	ServerInstance->Modules->AddService(commands->resync);
-	ServerInstance->Modules->AddService(commands->fmode);
-	ServerInstance->Modules->AddService(commands->ftopic);
-	ServerInstance->Modules->AddService(commands->fhost);
-	ServerInstance->Modules->AddService(commands->fident);
-	ServerInstance->Modules->AddService(commands->fname);
 
 	delete ServerInstance->PI;
-	ServerInstance->PI = new SpanningTreeProtocolInterface(Utils);
+	ServerInstance->PI = new SpanningTreeProtocolInterface;
 	loopCall = false;
 
 	// update our local user count
@@ -86,18 +75,21 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
 	{
 		Parent = Current->GetParent()->GetName();
 	}
-	for (unsigned int q = 0; q < Current->ChildCount(); q++)
+
+	const TreeServer::ChildServers& children = Current->GetChildren();
+	for (TreeServer::ChildServers::const_iterator i = children.begin(); i != children.end(); ++i)
 	{
-		if ((Current->GetChild(q)->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(Current->GetChild(q)->GetName()))))
+		TreeServer* server = *i;
+		if ((server->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(server->GetName()))))
 		{
 			if (user->IsOper())
 			{
-				 ShowLinks(Current->GetChild(q),user,hops+1);
+				 ShowLinks(server, user, hops+1);
 			}
 		}
 		else
 		{
-			ShowLinks(Current->GetChild(q),user,hops+1);
+			ShowLinks(server, user, hops+1);
 		}
 	}
 	/* Don't display the line if its a uline, hide ulines is on, and the user isnt an oper */
@@ -113,16 +105,10 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
 			Current->GetDesc().c_str());
 }
 
-int ModuleSpanningTree::CountServs()
-{
-	return Utils->serverlist.size();
-}
-
 void ModuleSpanningTree::HandleLinks(const std::vector<std::string>& parameters, User* user)
 {
 	ShowLinks(Utils->TreeRoot,user,0);
 	user->WriteNumeric(365, "%s * :End of /LINKS list.",user->nick.c_str());
-	return;
 }
 
 std::string ModuleSpanningTree::TimeToStr(time_t secs)
@@ -152,60 +138,53 @@ restart:
 	{
 		TreeServer *s = i->second;
 
-		if (s->GetSocket() && s->GetSocket()->GetLinkState() == DYING)
+		// Skip myself
+		if (s->IsRoot())
+			continue;
+
+		if (s->GetSocket()->GetLinkState() == DYING)
 		{
 			s->GetSocket()->Close();
 			goto restart;
 		}
 
-		// Fix for bug #792, do not ping servers that are not connected yet!
-		// Remote servers have Socket == NULL and local connected servers have
-		// Socket->LinkState == CONNECTED
-		if (s->GetSocket() && s->GetSocket()->GetLinkState() != CONNECTED)
+		// Do not ping servers that are not fully connected yet!
+		// Servers which are connected to us have IsLocal() == true and if they're fully connected
+		// then Socket->LinkState == CONNECTED. Servers that are linked to another server are always fully connected.
+		if (s->IsLocal() && s->GetSocket()->GetLinkState() != CONNECTED)
 			continue;
 
 		// Now do PING checks on all servers
-		TreeServer *mts = Utils->BestRouteTo(s->GetID());
-
-		if (mts)
+		// Only ping if this server needs one
+		if (curtime >= s->NextPingTime())
 		{
-			// Only ping if this server needs one
-			if (curtime >= s->NextPingTime())
+			// And if they answered the last
+			if (s->AnsweredLastPing())
 			{
-				// And if they answered the last
-				if (s->AnsweredLastPing())
-				{
-					// They did, send a ping to them
-					s->SetNextPingTime(curtime + Utils->PingFreq);
-					TreeSocket *tsock = mts->GetSocket();
-
-					// ... if we can find a proper route to them
-					if (tsock)
-					{
-						tsock->WriteLine(":" + ServerInstance->Config->GetSID() + " PING " + s->GetID());
-						s->LastPingMsec = ts;
-					}
-				}
-				else
+				// They did, send a ping to them
+				s->SetNextPingTime(curtime + Utils->PingFreq);
+				s->GetSocket()->WriteLine(":" + ServerInstance->Config->GetSID() + " PING " + s->GetID());
+				s->LastPingMsec = ts;
+			}
+			else
+			{
+				// They didn't answer the last ping, if they are locally connected, get rid of them.
+				if (s->IsLocal())
 				{
-					// They didn't answer the last ping, if they are locally connected, get rid of them.
-					TreeSocket *sock = s->GetSocket();
-					if (sock)
-					{
-						sock->SendError("Ping timeout");
-						sock->Close();
-						goto restart;
-					}
+					TreeSocket* sock = s->GetSocket();
+					sock->SendError("Ping timeout");
+					sock->Close();
+					goto restart;
 				}
 			}
+		}
 
-			// If warn on ping enabled and not warned and the difference is sufficient and they didn't answer the last ping...
-			if ((Utils->PingWarnTime) && (!s->Warned) && (curtime >= s->NextPingTime() - (Utils->PingFreq - Utils->PingWarnTime)) && (!s->AnsweredLastPing()))
-			{
-				/* The server hasnt responded, send a warning to opers */
-				ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not responded to PING for %d seconds, high latency.", s->GetName().c_str(), Utils->PingWarnTime);
-				s->Warned = true;
-			}
+		// If warn on ping enabled and not warned and the difference is sufficient and they didn't answer the last ping...
+		if ((Utils->PingWarnTime) && (!s->Warned) && (curtime >= s->NextPingTime() - (Utils->PingFreq - Utils->PingWarnTime)) && (!s->AnsweredLastPing()))
+		{
+			/* The server hasnt responded, send a warning to opers */
+			ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not responded to PING for %d seconds, high latency.", s->GetName().c_str(), Utils->PingWarnTime);
+			s->Warned = true;
 		}
 	}
 }
@@ -275,7 +254,7 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
 	if (ipvalid)
 	{
 		/* Gave a hook, but it wasnt one we know */
-		TreeSocket* newsocket = new TreeSocket(Utils, x, y, x->IPAddr);
+		TreeSocket* newsocket = new TreeSocket(x, y, x->IPAddr);
 		if (newsocket->GetFd() > -1)
 		{
 			/* Handled automatically on success */
@@ -293,7 +272,7 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
 	}
 	else
 	{
-		ServernameResolver* snr = new ServernameResolver(Utils, *DNS, x->IPAddr, x, start_type, y);
+		ServernameResolver* snr = new ServernameResolver(*DNS, x->IPAddr, x, start_type, y);
 		try
 		{
 			DNS->Process(snr);
@@ -408,6 +387,11 @@ ModResult ModuleSpanningTree::HandleConnect(const std::vector<std::string>& para
 	return MOD_RES_DENY;
 }
 
+void ModuleSpanningTree::On005Numeric(std::map<std::string, std::string>& tokens)
+{
+	tokens["MAP"];
+}
+
 void ModuleSpanningTree::OnGetServerDescription(const std::string &servername,std::string &description)
 {
 	TreeServer* s = Utils->FindServer(servername);
@@ -421,11 +405,11 @@ void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel,
 {
 	if (IS_LOCAL(source))
 	{
-		parameterlist params;
+		CmdBuilder params(source, "INVITE");
 		params.push_back(dest->uuid);
 		params.push_back(channel->name);
 		params.push_back(ConvToStr(expiry));
-		Utils->DoOneToMany(source->uuid,"INVITE",params);
+		params.Broadcast();
 	}
 }
 
@@ -435,27 +419,24 @@ void ModuleSpanningTree::OnPostTopicChange(User* user, Channel* chan, const std:
 	if (!IS_LOCAL(user))
 		return;
 
-	parameterlist params;
-	params.push_back(chan->name);
-	params.push_back(":"+topic);
-	Utils->DoOneToMany(user->uuid,"TOPIC",params);
+	CommandFTopic::Builder(user, chan).Broadcast();
 }
 
-void ModuleSpanningTree::LocalMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list, const char* message_type)
+void ModuleSpanningTree::OnUserMessage(User* user, void* dest, int target_type, const std::string& text, char status, const CUList& exempt_list, MessageType msgtype)
 {
-	/* Server or remote origin, dest should always be non-null */
-	if ((!user) || (!IS_LOCAL(user)) || (!dest))
+	if (!IS_LOCAL(user))
 		return;
 
+	const char* message_type = (msgtype == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE");
 	if (target_type == TYPE_USER)
 	{
 		User* d = (User*) dest;
 		if (!IS_LOCAL(d))
 		{
-			parameterlist params;
+			CmdBuilder params(user, message_type);
 			params.push_back(d->uuid);
-			params.push_back(":"+text);
-			Utils->DoOneToOne(user->uuid, message_type, params, d->server);
+			params.push_last(text);
+			params.Unicast(d);
 		}
 	}
 	else if (target_type == TYPE_CHANNEL)
@@ -465,18 +446,13 @@ void ModuleSpanningTree::LocalMessage(User* user, void* dest, int target_type, c
 	else if (target_type == TYPE_SERVER)
 	{
 		char* target = (char*) dest;
-		parameterlist par;
+		CmdBuilder par(user, message_type);
 		par.push_back(target);
-		par.push_back(":"+text);
-		Utils->DoOneToMany(user->uuid, message_type, par);
+		par.push_last(text);
+		par.Broadcast();
 	}
 }
 
-void ModuleSpanningTree::OnUserMessage(User* user, void* dest, int target_type, const std::string& text, char status, const CUList& exempt_list, MessageType msgtype)
-{
-	LocalMessage(user, dest, target_type, text, status, exempt_list, (msgtype == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE"));
-}
-
 void ModuleSpanningTree::OnBackgroundTimer(time_t curtime)
 {
 	AutoConnectServers(curtime);
@@ -489,26 +465,10 @@ void ModuleSpanningTree::OnUserConnect(LocalUser* user)
 	if (user->quitting)
 		return;
 
-	parameterlist params;
-	params.push_back(user->uuid);
-	params.push_back(ConvToStr(user->age));
-	params.push_back(user->nick);
-	params.push_back(user->host);
-	params.push_back(user->dhost);
-	params.push_back(user->ident);
-	params.push_back(user->GetIPString());
-	params.push_back(ConvToStr(user->signon));
-	params.push_back("+"+std::string(user->FormatModes(true)));
-	params.push_back(":"+user->fullname);
-	Utils->DoOneToMany(ServerInstance->Config->GetSID(), "UID", params);
+	CommandUID::Builder(user).Broadcast();
 
 	if (user->IsOper())
-	{
-		params.clear();
-		params.push_back(":");
-		params[0].append(user->oper->name);
-		Utils->DoOneToMany(user->uuid,"OPERTYPE",params);
-	}
+		CommandOpertype::Builder(user).Broadcast();
 
 	for(Extensible::ExtensibleStore::const_iterator i = user->GetExtList().begin(); i != user->GetExtList().end(); i++)
 	{
@@ -524,26 +484,28 @@ void ModuleSpanningTree::OnUserConnect(LocalUser* user)
 void ModuleSpanningTree::OnUserJoin(Membership* memb, bool sync, bool created_by_local, CUList& excepts)
 {
 	// Only do this for local users
-	if (IS_LOCAL(memb->user))
+	if (!IS_LOCAL(memb->user))
+		return;
+
+	if (created_by_local)
+	{
+		CmdBuilder params("FJOIN");
+		params.push_back(memb->chan->name);
+		params.push_back(ConvToStr(memb->chan->age));
+		params.push_raw(" +").push_raw(memb->chan->ChanModes(true));
+		params.push(memb->modes).push_raw(',').push_raw(memb->user->uuid);
+		params.Broadcast();
+	}
+	else
 	{
-		parameterlist params;
+		CmdBuilder params(memb->user, "IJOIN");
 		params.push_back(memb->chan->name);
-		if (created_by_local)
+		if (!memb->modes.empty())
 		{
 			params.push_back(ConvToStr(memb->chan->age));
-			params.push_back(std::string("+") + memb->chan->ChanModes(true));
-			params.push_back(memb->modes+","+memb->user->uuid);
-			Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params);
-		}
-		else
-		{
-			if (!memb->modes.empty())
-			{
-				params.push_back(ConvToStr(memb->chan->age));
-				params.push_back(memb->modes);
-			}
-			Utils->DoOneToMany(memb->user->uuid, "IJOIN", params);
+			params.push_back(memb->modes);
 		}
+		params.Broadcast();
 	}
 }
 
@@ -552,9 +514,7 @@ void ModuleSpanningTree::OnChangeHost(User* user, const std::string &newhost)
 	if (user->registered != REG_ALL || !IS_LOCAL(user))
 		return;
 
-	parameterlist params;
-	params.push_back(newhost);
-	Utils->DoOneToMany(user->uuid,"FHOST",params);
+	CmdBuilder(user, "FHOST").push(newhost).Broadcast();
 }
 
 void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos)
@@ -562,9 +522,7 @@ void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos)
 	if (user->registered != REG_ALL || !IS_LOCAL(user))
 		return;
 
-	parameterlist params;
-	params.push_back(gecos);
-	Utils->DoOneToMany(user->uuid,"FNAME",params);
+	CmdBuilder(user, "FNAME").push(gecos).Broadcast();
 }
 
 void ModuleSpanningTree::OnChangeIdent(User* user, const std::string &ident)
@@ -572,20 +530,18 @@ void ModuleSpanningTree::OnChangeIdent(User* user, const std::string &ident)
 	if ((user->registered != REG_ALL) || (!IS_LOCAL(user)))
 		return;
 
-	parameterlist params;
-	params.push_back(ident);
-	Utils->DoOneToMany(user->uuid,"FIDENT",params);
+	CmdBuilder(user, "FIDENT").push(ident).Broadcast();
 }
 
 void ModuleSpanningTree::OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts)
 {
 	if (IS_LOCAL(memb->user))
 	{
-		parameterlist params;
+		CmdBuilder params(memb->user, "PART");
 		params.push_back(memb->chan->name);
 		if (!partmessage.empty())
-			params.push_back(":"+partmessage);
-		Utils->DoOneToMany(memb->user->uuid,"PART",params);
+			params.push_last(partmessage);
+		params.Broadcast();
 	}
 }
 
@@ -593,16 +549,10 @@ void ModuleSpanningTree::OnUserQuit(User* user, const std::string &reason, const
 {
 	if ((IS_LOCAL(user)) && (user->registered == REG_ALL))
 	{
-		parameterlist params;
-
 		if (oper_message != reason)
-		{
-			params.push_back(":"+oper_message);
-			Utils->DoOneToMany(user->uuid,"OPERQUIT",params);
-		}
-		params.clear();
-		params.push_back(":"+reason);
-		Utils->DoOneToMany(user->uuid,"QUIT",params);
+			ServerInstance->PI->SendMetaData(user, "operquit", oper_message);
+
+		CmdBuilder(user, "QUIT").push_last(reason).Broadcast();
 	}
 
 	// Regardless, We need to modify the user Counts..
@@ -617,7 +567,7 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick)
 {
 	if (IS_LOCAL(user))
 	{
-		parameterlist params;
+		CmdBuilder params(user, "NICK");
 		params.push_back(user->nick);
 
 		/** IMPORTANT: We don't update the TS if the oldnick is just a case change of the newnick!
@@ -626,31 +576,27 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick)
 			user->age = ServerInstance->Time();
 
 		params.push_back(ConvToStr(user->age));
-		Utils->DoOneToMany(user->uuid,"NICK",params);
+		params.Broadcast();
 	}
 	else if (!loopCall && user->nick == user->uuid)
 	{
-		parameterlist params;
+		CmdBuilder params("SAVE");
 		params.push_back(user->uuid);
 		params.push_back(ConvToStr(user->age));
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(),"SAVE",params);
+		params.Broadcast();
 	}
 }
 
 void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts)
 {
-	parameterlist params;
+	if ((!IS_LOCAL(source) || source != ServerInstance->FakeClient))
+		return;
+
+	CmdBuilder params(source, "KICK");
 	params.push_back(memb->chan->name);
 	params.push_back(memb->user->uuid);
-	params.push_back(":"+reason);
-	if (IS_LOCAL(source))
-	{
-		Utils->DoOneToMany(source->uuid,"KICK",params);
-	}
-	else if (source == ServerInstance->FakeClient)
-	{
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(),"KICK",params);
-	}
+	params.push_last(reason);
+	params.Broadcast();
 }
 
 void ModuleSpanningTree::OnPreRehash(User* user, const std::string &parameter)
@@ -663,13 +609,13 @@ void ModuleSpanningTree::OnPreRehash(User* user, const std::string &parameter)
 	// Send out to other servers
 	if (!parameter.empty() && parameter[0] != '-')
 	{
-		parameterlist params;
+		CmdBuilder params((user ? user->uuid : ServerInstance->Config->GetSID()), "REHASH");
 		params.push_back(parameter);
-		Utils->DoOneToAllButSender(user ? user->uuid : ServerInstance->Config->GetSID(), "REHASH", params, user ? user->server : ServerInstance->Config->ServerName);
+		params.Forward(user ? Utils->BestRouteTo(user->server) : NULL);
 	}
 }
 
-void ModuleSpanningTree::OnRehash(User* user)
+void ModuleSpanningTree::ReadConfig(ConfigStatus& status)
 {
 	// Re-read config stuff
 	try
@@ -684,7 +630,7 @@ void ModuleSpanningTree::OnRehash(User* user)
 		std::string msg = "Error in configuration: ";
 		msg.append(e.GetReason());
 		ServerInstance->SNO->WriteToSnoMask('l', msg);
-		if (user && !IS_LOCAL(user))
+		if (status.srcuser && !IS_LOCAL(status.srcuser))
 			ServerInstance->PI->SendSNONotice("L", msg);
 	}
 }
@@ -700,24 +646,33 @@ void ModuleSpanningTree::OnLoadModule(Module* mod)
 		data.push_back('=');
 		data.append(v.link_data);
 	}
-	ServerInstance->PI->SendMetaData(NULL, "modules", data);
+	ServerInstance->PI->SendMetaData("modules", data);
 }
 
 void ModuleSpanningTree::OnUnloadModule(Module* mod)
 {
-	ServerInstance->PI->SendMetaData(NULL, "modules", "-" + mod->ModuleSourceFile);
+	if (!Utils)
+		return;
+	ServerInstance->PI->SendMetaData("modules", "-" + mod->ModuleSourceFile);
 
-	unsigned int items = Utils->TreeRoot->ChildCount();
-	for(unsigned int x = 0; x < items; x++)
+	// Close all connections which use an IO hook provided by this module
+	const TreeServer::ChildServers& list = Utils->TreeRoot->GetChildren();
+	for (TreeServer::ChildServers::const_iterator i = list.begin(); i != list.end(); ++i)
 	{
-		TreeServer* srv = Utils->TreeRoot->GetChild(x);
-		TreeSocket* sock = srv->GetSocket();
+		TreeSocket* sock = (*i)->GetSocket();
 		if (sock && sock->GetIOHook() && sock->GetIOHook()->creator == mod)
 		{
 			sock->SendError("SSL module unloaded");
 			sock->Close();
 		}
 	}
+
+	for (SpanningTreeUtilities::TimeoutList::const_iterator i = Utils->timeoutlist.begin(); i != Utils->timeoutlist.end(); ++i)
+	{
+		TreeSocket* sock = i->first;
+		if (sock->GetIOHook() && sock->GetIOHook()->creator == mod)
+			sock->Close();
+	}
 }
 
 // note: the protocol does not allow direct umode +o except
@@ -727,107 +682,42 @@ void ModuleSpanningTree::OnOper(User* user, const std::string &opertype)
 {
 	if (user->registered != REG_ALL || !IS_LOCAL(user))
 		return;
-	parameterlist params;
-	params.push_back(":");
-	params[0].append(opertype);
-	Utils->DoOneToMany(user->uuid,"OPERTYPE",params);
+	CommandOpertype::Builder(user).Broadcast();
 }
 
 void ModuleSpanningTree::OnAddLine(User* user, XLine *x)
 {
-	if (!x->IsBurstable() || loopCall)
+	if (!x->IsBurstable() || loopCall || (user && !IS_LOCAL(user)))
 		return;
 
-	parameterlist params;
-	params.push_back(x->type);
-	params.push_back(x->Displayable());
-	params.push_back(ServerInstance->Config->ServerName);
-	params.push_back(ConvToStr(x->set_time));
-	params.push_back(ConvToStr(x->duration));
-	params.push_back(":" + x->reason);
-
 	if (!user)
-	{
-		/* Server-set lines */
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(), "ADDLINE", params);
-	}
-	else if (IS_LOCAL(user))
-	{
-		/* User-set lines */
-		Utils->DoOneToMany(user->uuid, "ADDLINE", params);
-	}
+		user = ServerInstance->FakeClient;
+
+	CommandAddLine::Builder(x, user).Broadcast();
 }
 
 void ModuleSpanningTree::OnDelLine(User* user, XLine *x)
 {
-	if (!x->IsBurstable() || loopCall)
+	if (!x->IsBurstable() || loopCall || (user && !IS_LOCAL(user)))
 		return;
 
-	parameterlist params;
+	if (!user)
+		user = ServerInstance->FakeClient;
+
+	CmdBuilder params(user, "DELLINE");
 	params.push_back(x->type);
 	params.push_back(x->Displayable());
-
-	if (!user)
-	{
-		/* Server-unset lines */
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(), "DELLINE", params);
-	}
-	else if (IS_LOCAL(user))
-	{
-		/* User-unset lines */
-		Utils->DoOneToMany(user->uuid, "DELLINE", params);
-	}
+	params.Broadcast();
 }
 
 ModResult ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg)
 {
 	if (IS_LOCAL(user))
-	{
-		parameterlist params;
-		if (!awaymsg.empty())
-		{
-			params.push_back(ConvToStr(user->awaytime));
-			params.push_back(":" + awaymsg);
-		}
-		Utils->DoOneToMany(user->uuid, "AWAY", params);
-	}
+		CommandAway::Builder(user, awaymsg).Broadcast();
 
 	return MOD_RES_PASSTHRU;
 }
 
-void ModuleSpanningTree::ProtoSendMode(void* opaque, TargetTypeFlags target_type, void* target, const parameterlist &modeline, const std::vector<TranslateType> &translate)
-{
-	TreeSocket* s = (TreeSocket*)opaque;
-	std::string output_text = CommandParser::TranslateUIDs(translate, modeline);
-
-	if (target)
-	{
-		if (target_type == TYPE_USER)
-		{
-			User* u = (User*)target;
-			s->WriteLine(":"+ServerInstance->Config->GetSID()+" MODE "+u->uuid+" "+output_text);
-		}
-		else if (target_type == TYPE_CHANNEL)
-		{
-			Channel* c = (Channel*)target;
-			s->WriteLine(":"+ServerInstance->Config->GetSID()+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+output_text);
-		}
-	}
-}
-
-void ModuleSpanningTree::ProtoSendMetaData(void* opaque, Extensible* target, const std::string &extname, const std::string &extdata)
-{
-	TreeSocket* s = static_cast<TreeSocket*>(opaque);
-	User* u = dynamic_cast<User*>(target);
-	Channel* c = dynamic_cast<Channel*>(target);
-	if (u)
-		s->WriteLine(":"+ServerInstance->Config->GetSID()+" METADATA "+u->uuid+" "+extname+" :"+extdata);
-	else if (c)
-		s->WriteLine(":"+ServerInstance->Config->GetSID()+" METADATA "+c->name+" "+ConvToStr(c->age)+" "+extname+" :"+extdata);
-	else if (!target)
-		s->WriteLine(":"+ServerInstance->Config->GetSID()+" METADATA * "+extname+" :"+extdata);
-}
-
 CullResult ModuleSpanningTree::cull()
 {
 	if (Utils)