X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=8c04d6c909797cacebf09dbcbdb7c34d6ee7bd51;hb=d736eba00b274c87662bd73a3acf8288135643d6;hp=1067852d1a723733fc79df54dbad3644cfc131cc;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 1067852d1..8c04d6c90 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -21,13 +21,11 @@
  */
 
 
-/* $ModDesc: Provides a spanning tree server link protocol */
-
 #include "inspircd.h"
 #include "socket.h"
 #include "xline.h"
+#include "iohook.h"
 
-#include "cachetimer.h"
 #include "resolvers.h"
 #include "main.h"
 #include "utils.h"
@@ -38,56 +36,37 @@
 #include "protocolinterface.h"
 
 ModuleSpanningTree::ModuleSpanningTree()
+	: rconnect(this), rsquit(this), map(this)
+	, commands(NULL), DNS(this, "DNS")
 {
-	Utils = new SpanningTreeUtilities(this);
-	commands = new SpanningTreeCommands(this);
-	RefreshTimer = NULL;
 }
 
 SpanningTreeCommands::SpanningTreeCommands(ModuleSpanningTree* module)
-	: rconnect(module, module->Utils), rsquit(module, module->Utils),
-	svsjoin(module), svspart(module), svsnick(module), metadata(module),
-	uid(module), opertype(module), fjoin(module), fmode(module), ftopic(module),
-	fhost(module), fident(module), fname(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),
+	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)
 {
 }
 
 void ModuleSpanningTree::init()
 {
-	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->fmode);
-	ServerInstance->Modules->AddService(commands->ftopic);
-	ServerInstance->Modules->AddService(commands->fhost);
-	ServerInstance->Modules->AddService(commands->fident);
-	ServerInstance->Modules->AddService(commands->fname);
-	RefreshTimer = new CacheRefreshTimer(Utils);
-	ServerInstance->Timers->AddTimer(RefreshTimer);
-
-	Implementation eventlist[] =
-	{
-		I_OnPreCommand, I_OnGetServerDescription, I_OnUserInvite, I_OnPostTopicChange,
-		I_OnWallops, I_OnUserNotice, I_OnUserMessage, I_OnBackgroundTimer, I_OnUserJoin,
-		I_OnChangeHost, I_OnChangeName, I_OnChangeIdent, I_OnUserPart, I_OnUnloadModule,
-		I_OnUserQuit, I_OnUserPostNick, I_OnUserKick, I_OnRemoteKill, I_OnRehash, I_OnPreRehash,
-		I_OnOper, I_OnAddLine, I_OnDelLine, I_OnMode, I_OnLoadModule, I_OnStats,
-		I_OnSetAway, I_OnPostCommand, I_OnUserConnect, I_OnAcceptConnection
-	};
-	ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+	ServerInstance->SNO->EnableSnomask('l', "LINK");
+
+	Utils = new SpanningTreeUtilities(this);
+	Utils->TreeRoot = new TreeServer;
+	commands = new SpanningTreeCommands(this);
 
 	delete ServerInstance->PI;
-	ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils);
+	ServerInstance->PI = new SpanningTreeProtocolInterface;
 	loopCall = false;
+	SplitInProgress = false;
 
 	// update our local user count
-	Utils->TreeRoot->SetUserCount(ServerInstance->Users->local_users.size());
+	Utils->TreeRoot->UserCount = ServerInstance->Users->local_users.size();
 }
 
 void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
@@ -97,43 +76,40 @@ 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().c_str()))))
+		TreeServer* server = *i;
+		if ((server->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(server->GetName()))))
 		{
-			if (IS_OPER(user))
+			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 */
-	if ((Utils->HideULines) && (ServerInstance->ULine(Current->GetName().c_str())) && (!IS_OPER(user)))
+	if ((Utils->HideULines) && (ServerInstance->ULine(Current->GetName())) && (!user->IsOper()))
 		return;
 	/* Or if the server is hidden and they're not an oper */
-	else if ((Current->Hidden) && (!IS_OPER(user)))
+	else if ((Current->Hidden) && (!user->IsOper()))
 		return;
 
-	user->WriteNumeric(364, "%s %s %s :%d %s",	user->nick.c_str(),Current->GetName().c_str(),
-			(Utils->FlatLinks && (!IS_OPER(user))) ? ServerInstance->Config->ServerName.c_str() : Parent.c_str(),
-			(Utils->FlatLinks && (!IS_OPER(user))) ? 0 : hops,
+	user->WriteNumeric(RPL_LINKS, "%s %s :%d %s",	Current->GetName().c_str(),
+			(Utils->FlatLinks && (!user->IsOper())) ? ServerInstance->Config->ServerName.c_str() : Parent.c_str(),
+			(Utils->FlatLinks && (!user->IsOper())) ? 0 : 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;
+	user->WriteNumeric(RPL_ENDOFLINKS, "* :End of /LINKS list.");
 }
 
 std::string ModuleSpanningTree::TimeToStr(time_t secs)
@@ -144,9 +120,9 @@ std::string ModuleSpanningTree::TimeToStr(time_t secs)
 	secs = secs % 60;
 	mins_up = mins_up % 60;
 	hours_up = hours_up % 24;
-	return ((days_up ? (ConvToStr(days_up) + "d") : std::string(""))
-			+ (hours_up ? (ConvToStr(hours_up) + "h") : std::string(""))
-			+ (mins_up ? (ConvToStr(mins_up) + "m") : std::string(""))
+	return ((days_up ? (ConvToStr(days_up) + "d") : "")
+			+ (hours_up ? (ConvToStr(hours_up) + "h") : "")
+			+ (mins_up ? (ConvToStr(mins_up) + "m") : "")
 			+ ConvToStr(secs) + "s");
 }
 
@@ -162,62 +138,54 @@ restart:
 	for (server_hash::iterator i = Utils->serverlist.begin(); i != Utils->serverlist.end(); i++)
 	{
 		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(std::string(":") + ServerInstance->Config->GetSID() + " PING " +
-								ServerInstance->Config->GetSID() + " " + 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;
 		}
 	}
 }
@@ -269,8 +237,7 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
 		return;
 	}
 
-	QueryType start_type = DNS_QUERY_A;
-	start_type = DNS_QUERY_AAAA;
+	DNS::QueryType start_type = DNS::QUERY_AAAA;
 	if (strchr(x->IPAddr.c_str(),':'))
 	{
 		in6_addr n;
@@ -288,7 +255,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 */
@@ -300,17 +267,21 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
 			ServerInstance->GlobalCulls.AddItem(newsocket);
 		}
 	}
+	else if (!DNS)
+	{
+		ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: Hostname given and m_dns.so is not loaded, unable to resolve.", x->Name.c_str());
+	}
 	else
 	{
+		ServernameResolver* snr = new ServernameResolver(*DNS, x->IPAddr, x, start_type, y);
 		try
 		{
-			bool cached;
-			ServernameResolver* snr = new ServernameResolver(Utils, x->IPAddr, x, cached, start_type, y);
-			ServerInstance->AddResolver(snr, cached);
+			DNS->Process(snr);
 		}
-		catch (ModuleException& e)
+		catch (DNS::Exception& e)
 		{
-			ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason());
+			delete snr;
+			ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason().c_str());
 			ConnectServer(y, false);
 		}
 	}
@@ -358,16 +329,17 @@ ModResult ModuleSpanningTree::HandleVersion(const std::vector<std::string>& para
 	TreeServer* found = Utils->FindServerMask(parameters[0]);
 	if (found)
 	{
-		std::string Version = found->GetVersion();
-		user->WriteNumeric(351, "%s :%s",user->nick.c_str(),Version.c_str());
 		if (found == Utils->TreeRoot)
 		{
-			ServerInstance->Config->Send005(user);
+			// Pass to default VERSION handler.
+			return MOD_RES_PASSTHRU;
 		}
+		std::string Version = found->GetVersion();
+		user->WriteNumeric(RPL_VERSION, ":%s", Version.c_str());
 	}
 	else
 	{
-		user->WriteNumeric(402, "%s %s :No such server",user->nick.c_str(),parameters[0].c_str());
+		user->WriteNumeric(ERR_NOSUCHSERVER, "%s :No such server", parameters[0].c_str());
 	}
 	return MOD_RES_DENY;
 }
@@ -376,15 +348,11 @@ ModResult ModuleSpanningTree::HandleVersion(const std::vector<std::string>& para
  */
 void ModuleSpanningTree::RemoteMessage(User* user, const char* format, ...)
 {
-	char text[MAXBUF];
-	va_list argsPtr;
-
-	va_start(argsPtr, format);
-	vsnprintf(text, MAXBUF, format, argsPtr);
-	va_end(argsPtr);
+	std::string text;
+	VAFORMAT(text, format, format);
 
 	if (IS_LOCAL(user))
-		user->WriteServ("NOTICE %s :%s", user->nick.c_str(), text);
+		user->WriteNotice(text);
 	else
 		ServerInstance->PI->SendUserNotice(user, text);
 }
@@ -411,7 +379,7 @@ ModResult ModuleSpanningTree::HandleConnect(const std::vector<std::string>& para
 			}
 			else
 			{
-				RemoteMessage(user, "*** CONNECT: Server \002%s\002 already exists on the network and is connected via \002%s\002",x->Name.c_str(),CheckDupe->GetParent()->GetName().c_str());
+				RemoteMessage(user, "*** CONNECT: Server \002%s\002 already exists on the network and is connected via \002%s\002", x->Name.c_str(), CheckDupe->GetParent()->GetName().c_str());
 				return MOD_RES_DENY;
 			}
 		}
@@ -420,6 +388,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);
@@ -433,11 +406,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();
 	}
 }
 
@@ -447,123 +420,37 @@ 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::OnWallops(User* user, const std::string &text)
+void ModuleSpanningTree::OnUserMessage(User* user, void* dest, int target_type, const std::string& text, char status, const CUList& exempt_list, MessageType msgtype)
 {
-	if (IS_LOCAL(user))
-	{
-		parameterlist params;
-		params.push_back(":"+text);
-		Utils->DoOneToMany(user->uuid,"WALLOPS",params);
-	}
-}
-
-void ModuleSpanningTree::OnUserNotice(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
-{
-	/* Server origin */
-	if (user == NULL)
-		return;
-
-	if (target_type == TYPE_USER)
-	{
-		User* d = (User*)dest;
-		if (!IS_LOCAL(d) && IS_LOCAL(user))
-		{
-			parameterlist params;
-			params.push_back(d->uuid);
-			params.push_back(":"+text);
-			Utils->DoOneToOne(user->uuid,"NOTICE",params,d->server);
-		}
-	}
-	else if (target_type == TYPE_CHANNEL)
-	{
-		if (IS_LOCAL(user))
-		{
-			Channel *c = (Channel*)dest;
-			if (c)
-			{
-				std::string cname = c->name;
-				if (status)
-					cname = status + cname;
-				TreeServerList list;
-				Utils->GetListOfServersForChannel(c,list,status,exempt_list);
-				for (TreeServerList::iterator i = list.begin(); i != list.end(); i++)
-				{
-					TreeSocket* Sock = i->second->GetSocket();
-					if (Sock)
-						Sock->WriteLine(":"+std::string(user->uuid)+" NOTICE "+cname+" :"+text);
-				}
-			}
-		}
-	}
-	else if (target_type == TYPE_SERVER)
-	{
-		if (IS_LOCAL(user))
-		{
-			char* target = (char*)dest;
-			parameterlist par;
-			par.push_back(target);
-			par.push_back(":"+text);
-			Utils->DoOneToMany(user->uuid,"NOTICE",par);
-		}
-	}
-}
-
-void ModuleSpanningTree::OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
-{
-	/* Server origin */
-	if (user == NULL)
+	if (!IS_LOCAL(user))
 		return;
 
+	const char* message_type = (msgtype == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE");
 	if (target_type == TYPE_USER)
 	{
-		// route private messages which are targetted at clients only to the server
-		// which needs to receive them
-		User* d = (User*)dest;
-		if (!IS_LOCAL(d) && (IS_LOCAL(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,"PRIVMSG",params,d->server);
+			params.push_last(text);
+			params.Unicast(d);
 		}
 	}
 	else if (target_type == TYPE_CHANNEL)
 	{
-		if (IS_LOCAL(user))
-		{
-			Channel *c = (Channel*)dest;
-			if (c)
-			{
-				std::string cname = c->name;
-				if (status)
-					cname = status + cname;
-				TreeServerList list;
-				Utils->GetListOfServersForChannel(c,list,status,exempt_list);
-				for (TreeServerList::iterator i = list.begin(); i != list.end(); i++)
-				{
-					TreeSocket* Sock = i->second->GetSocket();
-					if (Sock)
-						Sock->WriteLine(":"+std::string(user->uuid)+" PRIVMSG "+cname+" :"+text);
-				}
-			}
-		}
+		Utils->SendChannelMessage(user->uuid, (Channel*)dest, text, status, exempt_list, message_type);
 	}
 	else if (target_type == TYPE_SERVER)
 	{
-		if (IS_LOCAL(user))
-		{
-			char* target = (char*)dest;
-			parameterlist par;
-			par.push_back(target);
-			par.push_back(":"+text);
-			Utils->DoOneToMany(user->uuid,"PRIVMSG",par);
-		}
+		char* target = (char*) dest;
+		CmdBuilder par(user, message_type);
+		par.push_back(target);
+		par.push_last(text);
+		par.Broadcast();
 	}
 }
 
@@ -579,25 +466,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(":"+std::string(user->fullname));
-	Utils->DoOneToMany(ServerInstance->Config->GetSID(), "UID", params);
+	CommandUID::Builder(user).Broadcast();
 
-	if (IS_OPER(user))
-	{
-		params.clear();
-		params.push_back(user->oper->name);
-		Utils->DoOneToMany(user->uuid,"OPERTYPE",params);
-	}
+	if (user->IsOper())
+		CommandOpertype::Builder(user).Broadcast();
 
 	for(Extensible::ExtensibleStore::const_iterator i = user->GetExtList().begin(); i != user->GetExtList().end(); i++)
 	{
@@ -607,23 +479,34 @@ void ModuleSpanningTree::OnUserConnect(LocalUser* user)
 			ServerInstance->PI->SendMetaData(user, item->name, value);
 	}
 
-	Utils->TreeRoot->SetUserCount(1); // increment by 1
+	Utils->TreeRoot->UserCount++;
 }
 
-void ModuleSpanningTree::OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts)
+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)
 	{
-		parameterlist params;
-		// set up their permissions and the channel TS with FJOIN.
-		// All users are FJOINed now, because a module may specify
-		// new joining permissions for the user.
+		CmdBuilder params("FJOIN");
 		params.push_back(memb->chan->name);
 		params.push_back(ConvToStr(memb->chan->age));
-		params.push_back(std::string("+") + memb->chan->ChanModes(true));
-		params.push_back(memb->modes+","+std::string(memb->user->uuid));
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params);
+		params.push_raw(" +").push_raw(memb->chan->ChanModes(true));
+		params.push(memb->modes).push_raw(',').push_raw(memb->user->uuid);
+		params.Broadcast();
+	}
+	else
+	{
+		CmdBuilder params(memb->user, "IJOIN");
+		params.push_back(memb->chan->name);
+		if (!memb->modes.empty())
+		{
+			params.push_back(ConvToStr(memb->chan->age));
+			params.push_back(memb->modes);
+		}
+		params.Broadcast();
 	}
 }
 
@@ -632,9 +515,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)
@@ -642,55 +523,56 @@ 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)
 {
-	// only occurs for local clients
-	if (user->registered != REG_ALL)
+	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();
 	}
 }
 
 void ModuleSpanningTree::OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
 {
-	if ((IS_LOCAL(user)) && (user->registered == REG_ALL))
+	if (IS_LOCAL(user))
 	{
-		parameterlist params;
-
 		if (oper_message != reason)
+			ServerInstance->PI->SendMetaData(user, "operquit", oper_message);
+
+		CmdBuilder(user, "QUIT").push_last(reason).Broadcast();
+	}
+	else
+	{
+		// Hide the message if one of the following is true:
+		// - User is being quit due to a netsplit and quietbursts is on
+		// - Server is a silent uline
+		bool hide = (((this->SplitInProgress) && (Utils->quiet_bursts)) || (ServerInstance->SilentULine(user->server)));
+		if (!hide)
 		{
-			params.push_back(":"+oper_message);
-			Utils->DoOneToMany(user->uuid,"OPERQUIT",params);
+			ServerInstance->SNO->WriteToSnoMask('Q', "Client exiting on server %s: %s (%s) [%s]",
+				user->server.c_str(), user->GetFullRealHost().c_str(), user->GetIPString().c_str(), oper_message.c_str());
 		}
-		params.clear();
-		params.push_back(":"+reason);
-		Utils->DoOneToMany(user->uuid,"QUIT",params);
 	}
 
 	// Regardless, We need to modify the user Counts..
 	TreeServer* SourceServer = Utils->FindServer(user->server);
 	if (SourceServer)
 	{
-		SourceServer->SetUserCount(-1); // decrement by 1
+		SourceServer->UserCount--;
 	}
 }
 
@@ -698,7 +580,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!
@@ -707,65 +589,63 @@ 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);
-	}
-}
-
-void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::string &reason, const std::string &operreason)
-{
-	if (!IS_LOCAL(source))
-		return; // Only start routing if we're origin.
-
-	ServerInstance->OperQuit.set(dest, operreason);
-	parameterlist params;
-	params.push_back(":"+operreason);
-	Utils->DoOneToMany(dest->uuid,"OPERQUIT",params);
-	params.clear();
-	params.push_back(dest->uuid);
-	params.push_back(":"+reason);
-	Utils->DoOneToMany(source->uuid,"KILL",params);
+	params.push_last(reason);
+	params.Broadcast();
 }
 
 void ModuleSpanningTree::OnPreRehash(User* user, const std::string &parameter)
 {
-	ServerInstance->Logs->Log("remoterehash", DEBUG, "called with param %s", parameter.c_str());
+	if (loopCall)
+		return; // Don't generate a REHASH here if we're in the middle of processing a message that generated this one
+
+	ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "OnPreRehash called with param %s", parameter.c_str());
 
 	// 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
-	Utils->ReadConfiguration();
+	try
+	{
+		Utils->ReadConfiguration();
+	}
+	catch (ModuleException& e)
+	{
+		// Refresh the IP cache anyway, so servers read before the error will be allowed to connect
+		Utils->RefreshIPCache();
+		// Always warn local opers with snomask +l, also warn globally (snomask +L) if the rehash was issued by a remote user
+		std::string msg = "Error in configuration: ";
+		msg.append(e.GetReason());
+		ServerInstance->SNO->WriteToSnoMask('l', msg);
+		if (status.srcuser && !IS_LOCAL(status.srcuser))
+			ServerInstance->PI->SendSNONotice('L', msg);
+	}
 }
 
 void ModuleSpanningTree::OnLoadModule(Module* mod)
@@ -779,28 +659,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();
-		if (sock && sock->GetIOHook() == mod)
+		TreeSocket* sock = (*i)->GetSocket();
+		if (sock && sock->GetIOHook() && sock->GetIOHook()->creator == mod)
 		{
 			sock->SendError("SSL module unloaded");
 			sock->Close();
 		}
 	}
-}
 
-void ModuleSpanningTree::RedoConfig(Module* mod)
-{
+	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
@@ -810,146 +695,46 @@ void ModuleSpanningTree::OnOper(User* user, const std::string &opertype)
 {
 	if (user->registered != REG_ALL || !IS_LOCAL(user))
 		return;
-	parameterlist params;
-	params.push_back(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;
 
-	char data[MAXBUF];
-	snprintf(data,MAXBUF,"%s %s %s %lu %lu :%s", x->type.c_str(), x->Displayable(),
-	ServerInstance->Config->ServerName.c_str(), (unsigned long)x->set_time, (unsigned long)x->duration, x->reason.c_str());
-	parameterlist params;
-	params.push_back(data);
-
 	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;
 
-	char data[MAXBUF];
-	snprintf(data,MAXBUF,"%s %s", x->type.c_str(), x->Displayable());
-	parameterlist params;
-	params.push_back(data);
-
 	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);
-	}
-}
-
-void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const parameterlist &text, const std::vector<TranslateType> &translate)
-{
-	if ((IS_LOCAL(user)) && (user->registered == REG_ALL))
-	{
-		parameterlist params;
-		std::string command;
-		std::string output_text;
-
-		ServerInstance->Parser->TranslateUIDs(translate, text, output_text);
+		user = ServerInstance->FakeClient;
 
-		if (target_type == TYPE_USER)
-		{
-			User* u = (User*)dest;
-			params.push_back(u->uuid);
-			params.push_back(output_text);
-			command = "MODE";
-		}
-		else
-		{
-			Channel* c = (Channel*)dest;
-			params.push_back(c->name);
-			params.push_back(ConvToStr(c->age));
-			params.push_back(output_text);
-			command = "FMODE";
-		}
-
-		Utils->DoOneToMany(user->uuid, command, params);
-	}
+	CmdBuilder params(user, "DELLINE");
+	params.push_back(x->type);
+	params.push_back(x->Displayable());
+	params.Broadcast();
 }
 
 ModResult ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg)
 {
 	if (IS_LOCAL(user))
-	{
-		if (awaymsg.empty())
-		{
-			parameterlist params;
-			Utils->DoOneToMany(user->uuid,"AWAY",params);
-		}
-		else
-		{
-			parameterlist params;
-			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;
-
-	ServerInstance->Parser->TranslateUIDs(translate, modeline, output_text);
-
-	if (target)
-	{
-		if (target_type == TYPE_USER)
-		{
-			User* u = (User*)target;
-			s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" MODE "+u->uuid+" "+output_text);
-		}
-		else if (target_type == TYPE_CHANNEL)
-		{
-			Channel* c = (Channel*)target;
-			s->WriteLine(std::string(":")+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(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+u->uuid+" "+extname+" :"+extdata);
-	else if (c)
-		s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+c->name+" "+extname+" :"+extdata);
-	else if (!target)
-		s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA * "+extname+" :"+extdata);
-}
-
 CullResult ModuleSpanningTree::cull()
 {
-	Utils->cull();
-	ServerInstance->Timers->DelTimer(RefreshTimer);
+	if (Utils)
+		Utils->cull();
 	return this->Module::cull();
 }