X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=b91d76836edaef9ebabb006ecb800f9681dcdcd1;hb=ada434820d2d81d8e4bcf633ebcbfef20606b51c;hp=09a788bd98db1251c30780ef88ac4f464e85fe3e;hpb=b2c7c614bd5a54f455d83d34d0ddb6d1f9fdaea1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 09a788bd9..b91d76836 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -30,31 +30,43 @@
 #include "m_spanningtree/treesocket.h"
 #include "m_spanningtree/rconnect.h"
 #include "m_spanningtree/rsquit.h"
+#include "m_spanningtree/protocolinterface.h"
 
-/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h m_spanningtree/rsquit.h */
+/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h m_spanningtree/rsquit.h m_spanningtree/protocolinterface.h */
 
 ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me)
 	: Module(Me), max_local(0), max_global(0)
 {
-	ServerInstance->UseInterface("InspSocketHook");
-	Utils = new SpanningTreeUtilities(Me, this);
+	ServerInstance->Modules->UseInterface("BufferedSocketHook");
+	Utils = new SpanningTreeUtilities(ServerInstance, this);
 	command_rconnect = new cmd_rconnect(ServerInstance, this, Utils);
 	ServerInstance->AddCommand(command_rconnect);
 	command_rsquit = new cmd_rsquit(ServerInstance, this, Utils);
 	ServerInstance->AddCommand(command_rsquit);
-	if (Utils->EnableTimeSync)
-	{
-		SyncTimer = new TimeSyncTimer(ServerInstance, this);
-		ServerInstance->Timers->AddTimer(SyncTimer);
-	}
-	else
-		SyncTimer = NULL;
-
 	RefreshTimer = new CacheRefreshTimer(ServerInstance, Utils);
 	ServerInstance->Timers->AddTimer(RefreshTimer);
+
+	Implementation eventlist[] =
+	{
+		I_OnPreCommand, I_OnGetServerDescription, I_OnUserInvite, I_OnPostLocalTopicChange,
+		I_OnWallops, I_OnUserNotice, I_OnUserMessage, I_OnBackgroundTimer,
+		I_OnUserJoin, I_OnChangeHost, I_OnChangeName, I_OnUserPart,
+		I_OnUserQuit, I_OnUserPostNick, I_OnUserKick, I_OnRemoteKill, I_OnRehash,
+		I_OnOper, I_OnAddLine, I_OnDelLine, I_ProtoSendMode, I_OnMode,
+		I_OnStats, I_ProtoSendMetaData, I_OnEvent, I_OnSetAway, I_OnPostCommand
+	};
+	ServerInstance->Modules->Attach(eventlist, this, 27);
+
+	delete ServerInstance->PI;
+	ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils, ServerInstance);
+
+	for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
+	{
+		ServerInstance->PI->Introduce(*i);
+	}
 }
 
-void ModuleSpanningTree::ShowLinks(TreeServer* Current, userrec* user, int hops)
+void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
 {
 	std::string Parent = Utils->TreeRoot->GetName();
 	if (Current->GetParent())
@@ -65,7 +77,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, userrec* user, int hops)
 	{
 		if ((Current->GetChild(q)->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(Current->GetChild(q)->GetName().c_str()))))
 		{
-			if (*user->oper)
+			if (IS_OPER(user))
 			{
 				 ShowLinks(Current->GetChild(q),user,hops+1);
 			}
@@ -82,7 +94,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, userrec* user, int hops)
 	else if ((Current->Hidden) && (!IS_OPER(user)))
 		return;
 
-	user->WriteServ("364 %s %s %s :%d %s",	user->nick,Current->GetName().c_str(),
+	user->WriteNumeric(364, "%s %s %s :%d %s",	user->nick.c_str(),Current->GetName().c_str(),
 			(Utils->FlatLinks && (!IS_OPER(user))) ? ServerInstance->Config->ServerName : Parent.c_str(),
 			(Utils->FlatLinks && (!IS_OPER(user))) ? 0 : hops,
 			Current->GetDesc().c_str());
@@ -98,20 +110,20 @@ int ModuleSpanningTree::CountServs()
 	return Utils->serverlist.size();
 }
 
-void ModuleSpanningTree::HandleLinks(const char** parameters, int pcnt, userrec* user)
+void ModuleSpanningTree::HandleLinks(const std::vector<std::string>& parameters, User* user)
 {
 	ShowLinks(Utils->TreeRoot,user,0);
-	user->WriteServ("365 %s * :End of /LINKS list.",user->nick);
+	user->WriteNumeric(365, "%s * :End of /LINKS list.",user->nick.c_str());
 	return;
 }
 
-void ModuleSpanningTree::HandleLusers(const char** parameters, int pcnt, userrec* user)
+void ModuleSpanningTree::HandleLusers(const std::vector<std::string>& parameters, User* user)
 {
-	unsigned int n_users = ServerInstance->UserCount();
+	unsigned int n_users = ServerInstance->Users->UserCount();
 
 	/* Only update these when someone wants to see them, more efficient */
-	if ((unsigned int)ServerInstance->LocalUserCount() > max_local)
-		max_local = ServerInstance->LocalUserCount();
+	if ((unsigned int)ServerInstance->Users->LocalUserCount() > max_local)
+		max_local = ServerInstance->Users->LocalUserCount();
 	if (n_users > max_global)
 		max_global = n_users;
 
@@ -121,7 +133,7 @@ void ModuleSpanningTree::HandleLusers(const char** parameters, int pcnt, userrec
 	/* If ulined are hidden and we're not an oper, count the number of ulined servers hidden,
 	 * locally and globally (locally means directly connected to us)
 	 */
-	if ((Utils->HideULines) && (!*user->oper))
+	if ((Utils->HideULines) && (!IS_OPER(user)))
 	{
 		for (server_hash::iterator q = Utils->serverlist.begin(); q != Utils->serverlist.end(); q++)
 		{
@@ -133,23 +145,23 @@ void ModuleSpanningTree::HandleLusers(const char** parameters, int pcnt, userrec
 			}
 		}
 	}
-	user->WriteServ("251 %s :There are %d users and %d invisible on %d servers",user->nick,
-			n_users-ServerInstance->InvisibleUserCount(),
-			ServerInstance->InvisibleUserCount(),
+	user->WriteNumeric(251, "%s :There are %d users and %d invisible on %d servers",user->nick.c_str(),
+			n_users-ServerInstance->Users->ModeCount('i'),
+			ServerInstance->Users->ModeCount('i'),
 			ulined_count ? this->CountServs() - ulined_count : this->CountServs());
 
-	if (ServerInstance->OperCount())
-		user->WriteServ("252 %s %d :operator(s) online",user->nick,ServerInstance->OperCount());
+	if (ServerInstance->Users->OperCount())
+		user->WriteNumeric(252, "%s %d :operator(s) online",user->nick.c_str(),ServerInstance->Users->OperCount());
 
-	if (ServerInstance->UnregisteredUserCount())
-		user->WriteServ("253 %s %d :unknown connections",user->nick,ServerInstance->UnregisteredUserCount());
+	if (ServerInstance->Users->UnregisteredUserCount())
+		user->WriteNumeric(253, "%s %d :unknown connections",user->nick.c_str(),ServerInstance->Users->UnregisteredUserCount());
 	
 	if (ServerInstance->ChannelCount())
-		user->WriteServ("254 %s %d :channels formed",user->nick,ServerInstance->ChannelCount());
+		user->WriteNumeric(254, "%s %ld :channels formed",user->nick.c_str(),ServerInstance->ChannelCount());
 	
-	user->WriteServ("255 %s :I have %d clients and %d servers",user->nick,ServerInstance->LocalUserCount(),ulined_local_count ? this->CountLocalServs() - ulined_local_count : this->CountLocalServs());
-	user->WriteServ("265 %s :Current Local Users: %d  Max: %d",user->nick,ServerInstance->LocalUserCount(),max_local);
-	user->WriteServ("266 %s :Current Global Users: %d  Max: %d",user->nick,n_users,max_global);
+	user->WriteNumeric(255, "%s :I have %d clients and %d servers",user->nick.c_str(),ServerInstance->Users->LocalUserCount(),ulined_local_count ? this->CountLocalServs() - ulined_local_count : this->CountLocalServs());
+	user->WriteNumeric(265, "%s :Current Local Users: %d  Max: %d",user->nick.c_str(),ServerInstance->Users->LocalUserCount(),max_local);
+	user->WriteNumeric(266, "%s :Current Global Users: %d  Max: %d",user->nick.c_str(),n_users,max_global);
 	return;
 }
 
@@ -167,352 +179,77 @@ std::string ModuleSpanningTree::TimeToStr(time_t secs)
 			+ ConvToStr(secs) + "s");
 }
 
-const std::string ModuleSpanningTree::MapOperInfo(TreeServer* Current)
+void ModuleSpanningTree::DoPingChecks(time_t curtime)
 {
-	time_t secs_up = ServerInstance->Time() - Current->age;
-	return (" [Up: " + TimeToStr(secs_up) + " Lag: "+ConvToStr(Current->rtt)+"ms]");
-}
+	/*
+	 * Cancel remote burst mode on any servers which still have it enabled due to latency/lack of data.
+	 * This prevents lost REMOTECONNECT notices
+	 */
+	timeval t;
+	gettimeofday(&t, NULL);
+	long ts = (t.tv_sec * 1000) + (t.tv_usec / 1000);
 
-// WARNING: NOT THREAD SAFE - DONT GET ANY SMART IDEAS.
-void ModuleSpanningTree::ShowMap(TreeServer* Current, userrec* user, int depth, char matrix[128][128], float &totusers, float &totservers)
-{
-	if (line < 128)
+	for (server_hash::iterator i = Utils->serverlist.begin(); i != Utils->serverlist.end(); i++)
 	{
-		for (int t = 0; t < depth; t++)
-		{
-			matrix[line][t] = ' ';
-		}
-		// For Aligning, we need to work out exactly how deep this thing is, and produce
-		// a 'Spacer' String to compensate.
-		char spacer[40];
-		memset(spacer,' ',40);
-		if ((40 - Current->GetName().length() - depth) > 1) {
-			spacer[40 - Current->GetName().length() - depth] = '\0';
-		}
-		else
-		{
-			spacer[5] = '\0';
-		}
-		float percent;
-		char text[128];
-		/* Neat and tidy default values, as we're dealing with a matrix not a simple string */
-		memset(text, 0, 128);
-
-		if (ServerInstance->clientlist->size() == 0) {
-			// If there are no users, WHO THE HELL DID THE /MAP?!?!?!
-			percent = 0;
-		}
-		else
-		{
-			percent = ((float)Current->GetUserCount() / (float)ServerInstance->clientlist->size()) * 100;
-		}
-		const std::string operdata = IS_OPER(user) ? MapOperInfo(Current) : "";
-		snprintf(text, 126, "%s %s%5d [%5.2f%%]%s", Current->GetName().c_str(), spacer, Current->GetUserCount(), percent, operdata.c_str());
-		totusers += Current->GetUserCount();
-		totservers++;
-		strlcpy(&matrix[line][depth],text,126);
-		line++;
-		for (unsigned int q = 0; q < Current->ChildCount(); q++)
+		TreeServer *s = i->second;
+
+		if (s->bursting)
 		{
-			if ((Current->GetChild(q)->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(Current->GetChild(q)->GetName().c_str()))))
+			unsigned long bursttime = ts - s->StartBurst;
+			if (bursttime > 60000) // A minute
 			{
-				if (*user->oper)
-				{
-					ShowMap(Current->GetChild(q),user,(Utils->FlatLinks && (!*user->oper)) ? depth : depth+2,matrix,totusers,totservers);
-				}
+				ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not finished burst, forcing end of burst.", s->GetName().c_str());
+				s->FinishBurst();
 			}
-			else
-			{
-				ShowMap(Current->GetChild(q),user,(Utils->FlatLinks && (!*user->oper)) ? depth : depth+2,matrix,totusers,totservers);
-			}
-		}
-	}
-}
-
-int ModuleSpanningTree::HandleMotd(const char** parameters, int pcnt, userrec* user)
-{
-	if (pcnt > 0)
-	{
-		if (match(ServerInstance->Config->ServerName, parameters[0]))
-			return 0;
-
-		/* Remote MOTD, the server is within the 1st parameter */
-		std::deque<std::string> params;
-		params.push_back(parameters[0]);
-		/* Send it out remotely, generate no reply yet */
-		TreeServer* s = Utils->FindServerMask(parameters[0]);
-		if (s)
-		{
-			params[0] = s->GetName();
-			Utils->DoOneToOne(user->uuid, "MOTD", params, s->GetName());
-		}
-		else
-			user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]);
-		return 1;
-	}
-	return 0;
-}
-
-int ModuleSpanningTree::HandleAdmin(const char** parameters, int pcnt, userrec* user)
-{
-	if (pcnt > 0)
-	{
-		if (match(ServerInstance->Config->ServerName, parameters[0]))
-			return 0;
-
-		/* Remote ADMIN, the server is within the 1st parameter */
-		std::deque<std::string> params;
-		params.push_back(parameters[0]);
-		/* Send it out remotely, generate no reply yet */
-		TreeServer* s = Utils->FindServerMask(parameters[0]);
-		if (s)
-		{
-			params[0] = s->GetName();
-			Utils->DoOneToOne(user->uuid, "ADMIN", params, s->GetName());
-		}
-		else
-			user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]);
-		return 1;
-	}
-	return 0;
-}
-
-int ModuleSpanningTree::HandleModules(const char** parameters, int pcnt, userrec* user)
-{
-	if (pcnt > 0)
-	{
-		if (match(ServerInstance->Config->ServerName, parameters[0]))
-			return 0;
-
-		std::deque<std::string> params;
-		params.push_back(parameters[0]);
-		TreeServer* s = Utils->FindServerMask(parameters[0]);
-		if (s)
-		{
-			params[0] = s->GetName();
-			Utils->DoOneToOne(user->uuid, "MODULES", params, s->GetName());
-		}
-		else
-			user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]);
-		return 1;
-	}
-	return 0;
-}
-
-int ModuleSpanningTree::HandleStats(const char** parameters, int pcnt, userrec* user)
-{
-	if (pcnt > 1)
-	{
-		if (match(ServerInstance->Config->ServerName, parameters[1]))
-			return 0;
-
-		/* Remote STATS, the server is within the 2nd parameter */
-		std::deque<std::string> params;
-		params.push_back(parameters[0]);
-		params.push_back(parameters[1]);
-		/* Send it out remotely, generate no reply yet */
-
-		TreeServer* s = Utils->FindServerMask(parameters[1]);
-		if (s)
-		{
-			params[1] = s->GetName();
-			Utils->DoOneToOne(user->uuid, "STATS", params, s->GetName());
-		}
-		else
-		{
-			user->WriteServ( "402 %s %s :No such server", user->nick, parameters[1]);
-		}
-		return 1;
-	}
-	return 0;
-}
-
-// Ok, prepare to be confused.
-// After much mulling over how to approach this, it struck me that
-// the 'usual' way of doing a /MAP isnt the best way. Instead of
-// keeping track of a ton of ascii characters, and line by line
-// under recursion working out where to place them using multiplications
-// and divisons, we instead render the map onto a backplane of characters
-// (a character matrix), then draw the branches as a series of "L" shapes
-// from the nodes. This is not only friendlier on CPU it uses less stack.
-void ModuleSpanningTree::HandleMap(const char** parameters, int pcnt, userrec* user)
-{
-	// This array represents a virtual screen which we will
-	// "scratch" draw to, as the console device of an irc
-	// client does not provide for a proper terminal.
-	float totusers = 0;
-	float totservers = 0;
-	char matrix[128][128];
-	for (unsigned int t = 0; t < 128; t++)
-	{
-		matrix[t][0] = '\0';
-	}
-	line = 0;
-	// The only recursive bit is called here.
-	ShowMap(Utils->TreeRoot,user,0,matrix,totusers,totservers);
-	// Process each line one by one. The algorithm has a limit of
-	// 128 servers (which is far more than a spanning tree should have
-	// anyway, so we're ok). This limit can be raised simply by making
-	// the character matrix deeper, 128 rows taking 10k of memory.
-	for (int l = 1; l < line; l++)
-	{
-		// scan across the line looking for the start of the
-		// servername (the recursive part of the algorithm has placed
-		// the servers at indented positions depending on what they
-		// are related to)
-		int first_nonspace = 0;
-		while (matrix[l][first_nonspace] == ' ')
-		{
-			first_nonspace++;
 		}
-		first_nonspace--;
-		// Draw the `- (corner) section: this may be overwritten by
-		// another L shape passing along the same vertical pane, becoming
-		// a |- (branch) section instead.
-		matrix[l][first_nonspace] = '-';
-		matrix[l][first_nonspace-1] = '`';
-		int l2 = l - 1;
-		// Draw upwards until we hit the parent server, causing possibly
-		// other corners (`-) to become branches (|-)
-		while ((matrix[l2][first_nonspace-1] == ' ') || (matrix[l2][first_nonspace-1] == '`'))
-		{
-			matrix[l2][first_nonspace-1] = '|';
-			l2--;
-		}
-	}
-	// dump the whole lot to the user. This is the easy bit, honest.
-	for (int t = 0; t < line; t++)
-	{
-		user->WriteServ("006 %s :%s",user->nick,&matrix[t][0]);
-	}
-	float avg_users = totusers / totservers;
-	user->WriteServ("270 %s :%.0f server%s and %.0f user%s, average %.2f users per server",user->nick,totservers,(totservers > 1 ? "s" : ""),totusers,(totusers > 1 ? "s" : ""),avg_users);
-	user->WriteServ("007 %s :End of /MAP",user->nick);
-	return;
-}
-
-int ModuleSpanningTree::HandleSquit(const char** parameters, int pcnt, userrec* user)
-{
-	TreeServer* s = Utils->FindServerMask(parameters[0]);
-	if (s)
-	{
-		if (s == Utils->TreeRoot)
-		{
-			user->WriteServ("NOTICE %s :*** SQUIT: Foolish mortal, you cannot make a server SQUIT itself! (%s matches local server name)",user->nick,parameters[0]);
-			return 1;
-		}
-		TreeSocket* sock = s->GetSocket();
-		if (sock)
-		{
-			ServerInstance->SNO->WriteToSnoMask('l',"SQUIT: Server \002%s\002 removed from network by %s",parameters[0],user->nick);
-			sock->Squit(s,std::string("Server quit by ") + user->GetFullRealHost());
-			ServerInstance->SE->DelFd(sock);
-			sock->Close();
-		}
-		else
-		{
-			if (IS_LOCAL(user))
-				user->WriteServ("NOTICE %s :*** WARNING: Using SQUIT to split remote servers is deprecated. Please use RSQUIT instead.",user->nick);
-		}
-	}
-	else
-	{
-		 user->WriteServ("NOTICE %s :*** SQUIT: The server \002%s\002 does not exist on the network.",user->nick,parameters[0]);
-	}
-	return 1;
-}
-
-int ModuleSpanningTree::HandleTime(const char** parameters, int pcnt, userrec* user)
-{
-	if ((IS_LOCAL(user)) && (pcnt))
-	{
-		TreeServer* found = Utils->FindServerMask(parameters[0]);
-		if (found)
-		{
-			// we dont' override for local server
-			if (found == Utils->TreeRoot)
-				return 0;
-			
-			std::deque<std::string> params;
-			params.push_back(found->GetName());
-			params.push_back(user->uuid);
-			Utils->DoOneToOne(ServerInstance->Config->GetSID(),"TIME",params,found->GetName());
-		}
-		else
-		{
-			user->WriteServ("402 %s %s :No such server",user->nick,parameters[0]);
-		}
-	}
-	return 1;
-}
 
-int ModuleSpanningTree::HandleRemoteWhois(const char** parameters, int pcnt, userrec* user)
-{
-	if ((IS_LOCAL(user)) && (pcnt > 1))
-	{
-		userrec* remote = ServerInstance->FindNick(parameters[1]);
-		if ((remote) && (remote->GetFd() < 0))
-		{
-			std::deque<std::string> params;
-			params.push_back(parameters[1]);
-			Utils->DoOneToOne(user->uuid,"IDLE",params,remote->server);
-			return 1;
-		}
-		else if (!remote)
-		{
-			user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[1]);
-			user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, parameters[1]);
-			return 1;
-		}
-	}
-	return 0;
-}
+		// Now do PING checks on all servers
+		TreeServer *mts = Utils->BestRouteTo(s->GetID());
 
-void ModuleSpanningTree::DoPingChecks(time_t curtime)
-{
-	for (unsigned int j = 0; j < Utils->TreeRoot->ChildCount(); j++)
-	{
-		TreeServer* serv = Utils->TreeRoot->GetChild(j);
-		TreeSocket* sock = serv->GetSocket();
-		if (sock)
+		if (mts)
 		{
-			if (curtime >= serv->NextPingTime())
+			// Only ping if this server needs one
+			if (curtime >= s->NextPingTime())
 			{
-				if (serv->AnsweredLastPing())
+				// And if they answered the last
+				if (s->AnsweredLastPing())
 				{
-					sock->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" PING "+serv->GetName());
-					serv->SetNextPingTime(curtime + Utils->PingFreq);
-					serv->LastPing = curtime;
-					timeval t;
-					gettimeofday(&t, NULL);
-					long ts = (t.tv_sec * 1000) + (t.tv_usec / 1000);
-					serv->LastPingMsec = ts;
-					serv->Warned = false;
+					// 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 didnt answer, boot them */
-					sock->SendError("Ping timeout");
-					sock->Squit(serv,"Ping timeout");
-					ServerInstance->SE->DelFd(sock);
-					sock->Close();
-					return;
+					// 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->Squit(s,"Ping timeout");
+						ServerInstance->SE->DelFd(sock);
+						sock->Close();
+						return;
+					}
 				}
 			}
-			else if ((Utils->PingWarnTime) && (!serv->Warned) && (curtime >= serv->NextPingTime() - (Utils->PingFreq - Utils->PingWarnTime)) && (!serv->AnsweredLastPing()))
+
+			// 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.", serv->GetName().c_str(), Utils->PingWarnTime);
-				serv->Warned = true;
+				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;
 			}
 		}
 	}
-
-	/* Cancel remote burst mode on any servers which still have it enabled due to latency/lack of data.
-	 * This prevents lost REMOTECONNECT notices
-	 */
-	for (server_hash::iterator i = Utils->serverlist.begin(); i != Utils->serverlist.end(); i++)
-		Utils->SetRemoteBursting(i->second, false);
 }
 
 void ModuleSpanningTree::ConnectServer(Link* x)
@@ -600,14 +337,14 @@ void ModuleSpanningTree::AutoConnectServers(time_t curtime)
 	}
 }
 
-int ModuleSpanningTree::HandleVersion(const char** parameters, int pcnt, userrec* user)
+int ModuleSpanningTree::HandleVersion(const std::vector<std::string>& parameters, User* user)
 {
 	// we've already checked if pcnt > 0, so this is safe
 	TreeServer* found = Utils->FindServerMask(parameters[0]);
 	if (found)
 	{
 		std::string Version = found->GetVersion();
-		user->WriteServ("351 %s :%s",user->nick,Version.c_str());
+		user->WriteNumeric(351, "%s :%s",user->nick.c_str(),Version.c_str());
 		if (found == Utils->TreeRoot)
 		{
 			ServerInstance->Config->Send005(user);
@@ -615,7 +352,7 @@ int ModuleSpanningTree::HandleVersion(const char** parameters, int pcnt, userrec
 	}
 	else
 	{
-		user->WriteServ("402 %s %s :No such server",user->nick,parameters[0]);
+		user->WriteNumeric(402, "%s %s :No such server",user->nick.c_str(),parameters[0].c_str());
 	}
 	return 1;
 }
@@ -627,9 +364,17 @@ int ModuleSpanningTree::HandleVersion(const char** parameters, int pcnt, userrec
  * If the user is NULL, then the notice is sent locally via WriteToSnoMask with snomask 'l',
  * and remotely via SNONOTICE with mask 'l'.
  */
-void ModuleSpanningTree::RemoteMessage(userrec* user, const char* format, ...)
-{
-	std::deque<std::string> params;
+void ModuleSpanningTree::RemoteMessage(User* user, const char* format, ...)
+{
+	/* This could cause an infinite loop, because DoOneToMany() will, on error,
+	 * call TreeSocket::OnError(), which in turn will call this function to
+	 * notify everyone of the error. So, drop any messages that are generated
+	 * during the sending of another message. -Special */
+	static bool SendingRemoteMessage = false;
+	if (SendingRemoteMessage)
+		return;
+	SendingRemoteMessage = true;
+
 	char text[MAXBUF];
 	va_list argsPtr;
 
@@ -641,25 +386,19 @@ void ModuleSpanningTree::RemoteMessage(userrec* user, const char* format, ...)
 	{
 		/* No user, target it generically at everyone */
 		ServerInstance->SNO->WriteToSnoMask('l', "%s", text);
-		params.push_back("l");
-		params.push_back(std::string(":") + text);
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(), "SNONOTICE", params);
 	}
 	else
 	{
 		if (IS_LOCAL(user))
-			user->WriteServ("NOTICE %s :%s", user->nick, text);
+			user->WriteServ("NOTICE %s :%s", user->nick.c_str(), text);
 		else
-		{
-			params.push_back(user->uuid);
-			params.push_back(std::string("::") + ServerInstance->Config->ServerName + " NOTICE " + user->nick + " :*** From " +
-					ServerInstance->Config->ServerName+ ": " + text);
-			Utils->DoOneToMany(ServerInstance->Config->GetSID(), "PUSH", params);
-		}
+			ServerInstance->PI->SendUserNotice(user, text);
 	}
+	
+	SendingRemoteMessage = false;
 }
 	
-int ModuleSpanningTree::HandleConnect(const char** parameters, int pcnt, userrec* user)
+int ModuleSpanningTree::HandleConnect(const std::vector<std::string>& parameters, User* user)
 {
 	for (std::vector<Link>::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++)
 	{
@@ -668,174 +407,21 @@ int ModuleSpanningTree::HandleConnect(const char** parameters, int pcnt, userrec
 			TreeServer* CheckDupe = Utils->FindServer(x->Name.c_str());
 			if (!CheckDupe)
 			{
-				RemoteMessage(user, "*** CONNECT: Connecting to server: \002%s\002 (%s:%d)",user->nick,x->Name.c_str(),(x->HiddenFromStats ? "<hidden>" : x->IPAddr.c_str()),x->Port);
+				RemoteMessage(user, "*** CONNECT: Connecting to server: \002%s\002 (%s:%d)",x->Name.c_str(),(x->HiddenFromStats ? "<hidden>" : x->IPAddr.c_str()),x->Port);
 				ConnectServer(&(*x));
 				return 1;
 			}
 			else
 			{
-				RemoteMessage(user, "*** CONNECT: Server \002%s\002 already exists on the network and is connected via \002%s\002",user->nick,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 1;
 			}
 		}
 	}
-	RemoteMessage(user, "NOTICE %s :*** CONNECT: No server matching \002%s\002 could be found in the config file.",user->nick,parameters[0]);
+	RemoteMessage(user, "*** CONNECT: No server matching \002%s\002 could be found in the config file.",parameters[0].c_str());
 	return 1;
 }
 
-void ModuleSpanningTree::BroadcastTimeSync()
-{
-	if (Utils->MasterTime)
-	{
-		std::deque<std::string> params;
-		params.push_back(ConvToStr(ServerInstance->Time(false)));
-		params.push_back("FORCE");
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(), "TIMESET", params);
-	}
-}
-
-int ModuleSpanningTree::OnStats(char statschar, userrec* user, string_list &results)
-{
-	if ((statschar == 'c') || (statschar == 'n'))
-	{
-		for (unsigned int i = 0; i < Utils->LinkBlocks.size(); i++)
-		{
-			results.push_back(std::string(ServerInstance->Config->ServerName)+" 213 "+user->nick+" "+statschar+" *@"+(Utils->LinkBlocks[i].HiddenFromStats ? "<hidden>" : Utils->LinkBlocks[i].IPAddr)+" * "+Utils->LinkBlocks[i].Name.c_str()+" "+ConvToStr(Utils->LinkBlocks[i].Port)+" "+(Utils->LinkBlocks[i].Hook.empty() ? "plaintext" : Utils->LinkBlocks[i].Hook)+" "+(Utils->LinkBlocks[i].AutoConnect ? 'a' : '-')+'s');
-			if (statschar == 'c')
-				results.push_back(std::string(ServerInstance->Config->ServerName)+" 244 "+user->nick+" H * * "+Utils->LinkBlocks[i].Name.c_str());
-		}
-		results.push_back(std::string(ServerInstance->Config->ServerName)+" 219 "+user->nick+" "+statschar+" :End of /STATS report");
-		ServerInstance->SNO->WriteToSnoMask('t',"%s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host);
-		return 1;
-	}
-
-	if (statschar == 'p')
-	{
-		/* show all server ports, after showing client ports. -- w00t */
-
-		for (unsigned int i = 0; i < Utils->Bindings.size(); i++)
-		{
-			std::string ip = Utils->Bindings[i]->IP;
-			if (ip.empty())
-				ip = "*";
-
-			std::string transport("plaintext");
-			if (Utils->Bindings[i]->GetHook())
-				transport = InspSocketNameRequest(this, Utils->Bindings[i]->GetHook()).Send();
-
-			results.push_back(ConvToStr(ServerInstance->Config->ServerName) + " 249 "+user->nick+" :" + ip + ":" + ConvToStr(Utils->Bindings[i]->port)+
-				" (server, " + transport + ")");
-		}
-	}
-	return 0;
-}
-
-int ModuleSpanningTree::OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
-{
-	/* If the command doesnt appear to be valid, we dont want to mess with it. */
-	if (!validated)
-		return 0;
-
-	if (command == "CONNECT")
-	{
-		return this->HandleConnect(parameters,pcnt,user);
-	}
-	else if (command == "STATS")
-	{
-		return this->HandleStats(parameters,pcnt,user);
-	}
-	else if (command == "MOTD")
-	{
-		return this->HandleMotd(parameters,pcnt,user);
-	}
-	else if (command == "ADMIN")
-	{
-		return this->HandleAdmin(parameters,pcnt,user);
-	}
-	else if (command == "SQUIT")
-	{
-		return this->HandleSquit(parameters,pcnt,user);
-	}
-	else if (command == "MAP")
-	{
-		this->HandleMap(parameters,pcnt,user);
-		return 1;
-	}
-	else if ((command == "TIME") && (pcnt > 0))
-	{
-		return this->HandleTime(parameters,pcnt,user);
-	}
-	else if (command == "LUSERS")
-	{
-		this->HandleLusers(parameters,pcnt,user);
-		return 1;
-	}
-	else if (command == "LINKS")
-	{
-		this->HandleLinks(parameters,pcnt,user);
-		return 1;
-	}
-	else if (command == "WHOIS")
-	{
-		if (pcnt > 1)
-		{
-			// remote whois
-			return this->HandleRemoteWhois(parameters,pcnt,user);
-		}
-	}
-	else if ((command == "VERSION") && (pcnt > 0))
-	{
-		this->HandleVersion(parameters,pcnt,user);
-		return 1;
-	}
-	else if ((command == "MODULES") && (pcnt > 0))
-	{
-		return this->HandleModules(parameters,pcnt,user);
-	}
-	return 0;
-}
-
-void ModuleSpanningTree::OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line)
-{
-	if ((result == CMD_SUCCESS) && (ServerInstance->IsValidModuleCommand(command, pcnt, user)))
-	{
-		/* Safe, we know its non-null because IsValidModuleCommand returned true */
-		command_t* thiscmd = ServerInstance->Parser->GetHandler(command);
-		// this bit of code cleverly routes all module commands
-		// to all remote severs *automatically* so that modules
-		// can just handle commands locally, without having
-		// to have any special provision in place for remote
-		// commands and linking protocols.
-		std::deque<std::string> params;
-		params.clear();
-		int n_translate = thiscmd->translation.size();
-		TranslateType translate_to;
-
-		for (int j = 0; j < pcnt; j++)
-		{
-			std::string target;
-
-			/* Map all items to UUIDs where neccessary */
-			if (j < n_translate)
-			{
-				/* We have a translation mapping for this index */
-				translate_to = thiscmd->translation[j] != TR_END ? thiscmd->translation[j] : TR_TEXT;
-			}
-			else
-				translate_to = TR_TEXT;
-
-			ServerInstance->Log(DEBUG,"TRANSLATION: %s - type is %d", parameters[j], translate_to);
-			ServerInstance->Parser->TranslateUIDs(translate_to, parameters[j], target);
-
-			if (strchr(parameters[j],' '))
-				params.push_back(":" + target);
-			else
-				params.push_back(target);
-		}
-		Utils->DoOneToMany(user->uuid, command, params);
-	}
-}
-
 void ModuleSpanningTree::OnGetServerDescription(const std::string &servername,std::string &description)
 {
 	TreeServer* s = Utils->FindServer(servername);
@@ -845,18 +431,19 @@ void ModuleSpanningTree::OnGetServerDescription(const std::string &servername,st
 	}
 }
 
-void ModuleSpanningTree::OnUserInvite(userrec* source,userrec* dest,chanrec* channel)
+void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel, time_t expiry)
 {
 	if (IS_LOCAL(source))
 	{
 		std::deque<std::string> params;
 		params.push_back(dest->uuid);
 		params.push_back(channel->name);
+		params.push_back(ConvToStr(expiry));
 		Utils->DoOneToMany(source->uuid,"INVITE",params);
 	}
 }
 
-void ModuleSpanningTree::OnPostLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic)
+void ModuleSpanningTree::OnPostLocalTopicChange(User* user, Channel* chan, const std::string &topic)
 {
 	std::deque<std::string> params;
 	params.push_back(chan->name);
@@ -864,7 +451,7 @@ void ModuleSpanningTree::OnPostLocalTopicChange(userrec* user, chanrec* chan, co
 	Utils->DoOneToMany(user->uuid,"TOPIC",params);
 }
 
-void ModuleSpanningTree::OnWallops(userrec* user, const std::string &text)
+void ModuleSpanningTree::OnWallops(User* user, const std::string &text)
 {
 	if (IS_LOCAL(user))
 	{
@@ -874,11 +461,15 @@ void ModuleSpanningTree::OnWallops(userrec* user, const std::string &text)
 	}
 }
 
-void ModuleSpanningTree::OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
+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)
 	{
-		userrec* d = (userrec*)dest;
+		User* d = (User*)dest;
 		if ((d->GetFd() < 0) && (IS_LOCAL(user)))
 		{
 			std::deque<std::string> params;
@@ -892,7 +483,7 @@ void ModuleSpanningTree::OnUserNotice(userrec* user, void* dest, int target_type
 	{
 		if (IS_LOCAL(user))
 		{
-			chanrec *c = (chanrec*)dest;
+			Channel *c = (Channel*)dest;
 			if (c)
 			{
 				std::string cname = c->name;
@@ -922,13 +513,17 @@ void ModuleSpanningTree::OnUserNotice(userrec* user, void* dest, int target_type
 	}
 }
 
-void ModuleSpanningTree::OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
+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)
+		return;
+
 	if (target_type == TYPE_USER)
 	{
 		// route private messages which are targetted at clients only to the server
 		// which needs to receive them
-		userrec* d = (userrec*)dest;
+		User* d = (User*)dest;
 		if ((d->GetFd() < 0) && (IS_LOCAL(user)))
 		{
 			std::deque<std::string> params;
@@ -942,7 +537,7 @@ void ModuleSpanningTree::OnUserMessage(userrec* user, void* dest, int target_typ
 	{
 		if (IS_LOCAL(user))
 		{
-			chanrec *c = (chanrec*)dest;
+			Channel *c = (Channel*)dest;
 			if (c)
 			{
 				std::string cname = c->name;
@@ -978,37 +573,24 @@ void ModuleSpanningTree::OnBackgroundTimer(time_t curtime)
 	DoPingChecks(curtime);
 }
 
-void ModuleSpanningTree::OnUserJoin(userrec* user, chanrec* channel, bool &silent)
+void ModuleSpanningTree::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
 {
 	// Only do this for local users
 	if (IS_LOCAL(user))
 	{
-		if (channel->GetUserCounter() == 1)
-		{
-			std::deque<std::string> 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.
-			params.push_back(channel->name);
-			params.push_back(ConvToStr(channel->age));
-			params.push_back(std::string(channel->GetAllPrefixChars(user))+","+std::string(user->uuid));
-			Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params);
-			/* First user in, sync the modes for the channel */
-			params.pop_back();
-			params.push_back(channel->ChanModes(true));
-			Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FMODE",params);
-		}
-		else
-		{
-			std::deque<std::string> params;
-			params.push_back(channel->name);
-			params.push_back(ConvToStr(channel->age));
-			Utils->DoOneToMany(user->uuid,"JOIN",params);
-		}
+		std::deque<std::string> 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.
+		params.push_back(channel->name);
+		params.push_back(ConvToStr(channel->age));
+		params.push_back(std::string("+") + channel->ChanModes(true));
+		params.push_back(ServerInstance->Modes->ModeString(user, channel, false)+","+std::string(user->uuid));
+		Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params);
 	}
 }
 
-void ModuleSpanningTree::OnChangeHost(userrec* user, const std::string &newhost)
+void ModuleSpanningTree::OnChangeHost(User* user, const std::string &newhost)
 {
 	// only occurs for local clients
 	if (user->registered != REG_ALL)
@@ -1018,7 +600,7 @@ void ModuleSpanningTree::OnChangeHost(userrec* user, const std::string &newhost)
 	Utils->DoOneToMany(user->uuid,"FHOST",params);
 }
 
-void ModuleSpanningTree::OnChangeName(userrec* user, const std::string &gecos)
+void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos)
 {
 	// only occurs for local clients
 	if (user->registered != REG_ALL)
@@ -1028,7 +610,7 @@ void ModuleSpanningTree::OnChangeName(userrec* user, const std::string &gecos)
 	Utils->DoOneToMany(user->uuid,"FNAME",params);
 }
 
-void ModuleSpanningTree::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent)
+void ModuleSpanningTree::OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
 {
 	if (IS_LOCAL(user))
 	{
@@ -1040,33 +622,7 @@ void ModuleSpanningTree::OnUserPart(userrec* user, chanrec* channel, const std::
 	}
 }
 
-void ModuleSpanningTree::OnUserConnect(userrec* user)
-{
-	char agestr[MAXBUF];
-	if (IS_LOCAL(user))
-	{
-		std::deque<std::string> params;
-		snprintf(agestr,MAXBUF,"%lu",(unsigned long)user->age);
-		params.push_back(user->uuid);
-		params.push_back(agestr);
-		params.push_back(user->nick);
-		params.push_back(user->host);
-		params.push_back(user->dhost);
-		params.push_back(user->ident);
-		params.push_back("+"+std::string(user->FormatModes()));
-		params.push_back(user->GetIPString());
-		params.push_back(":"+std::string(user->fullname));
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(), "UID", params);
-		// User is Local, change needs to be reflected!
-		TreeServer* SourceServer = Utils->FindServer(user->server);
-		if (SourceServer)
-		{
-			SourceServer->AddUserCount();
-		}
-	}
-}
-
-void ModuleSpanningTree::OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+void ModuleSpanningTree::OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
 {
 	if ((IS_LOCAL(user)) && (user->registered == REG_ALL))
 	{
@@ -1081,25 +637,33 @@ void ModuleSpanningTree::OnUserQuit(userrec* user, const std::string &reason, co
 		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->DelUserCount();
+		SourceServer->SetUserCount(-1); // decrement by 1
 	}
 }
 
-void ModuleSpanningTree::OnUserPostNick(userrec* user, const std::string &oldnick)
+void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick)
 {
 	if (IS_LOCAL(user))
 	{
 		std::deque<std::string> params;
 		params.push_back(user->nick);
+
+		/** IMPORTANT: We don't update the TS if the oldnick is just a case change of the newnick!
+		 */
+		if (irc::string(user->nick.c_str()) != assign(oldnick))
+			user->age = ServerInstance->Time();
+
+		params.push_back(ConvToStr(user->age));
 		Utils->DoOneToMany(user->uuid,"NICK",params);
 	}
 }
 
-void ModuleSpanningTree::OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent)
+void ModuleSpanningTree::OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
 {
 	if ((source) && (IS_LOCAL(source)))
 	{
@@ -1119,7 +683,7 @@ void ModuleSpanningTree::OnUserKick(userrec* source, userrec* user, chanrec* cha
 	}
 }
 
-void ModuleSpanningTree::OnRemoteKill(userrec* source, userrec* dest, const std::string &reason, const std::string &operreason)
+void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::string &reason, const std::string &operreason)
 {
 	std::deque<std::string> params;
 	params.push_back(":"+reason);
@@ -1131,28 +695,27 @@ void ModuleSpanningTree::OnRemoteKill(userrec* source, userrec* dest, const std:
 	Utils->DoOneToMany(source->uuid,"KILL",params);
 }
 
-void ModuleSpanningTree::OnRehash(userrec* user, const std::string &parameter)
+void ModuleSpanningTree::OnRehash(User* user, const std::string &parameter)
 {
-	if (!parameter.empty())
+	ServerInstance->Logs->Log("remoterehash", DEBUG, "called with param %s", parameter.c_str());
+
+	// Send out to other servers
+	if (!parameter.empty() && parameter[0] != '-')
 	{
+		ServerInstance->Logs->Log("remoterehash", DEBUG, "sending out lol");
 		std::deque<std::string> params;
 		params.push_back(parameter);
-		Utils->DoOneToMany(user ? user->nick : ServerInstance->Config->GetSID(), "REHASH", params);
-		// check for self
-		if (ServerInstance->MatchText(ServerInstance->Config->ServerName,parameter))
-		{
-			ServerInstance->WriteOpers("*** Remote rehash initiated locally by \002%s\002", user ? user->nick : ServerInstance->Config->ServerName);
-			ServerInstance->RehashServer();
-		}
+		Utils->DoOneToAllButSender(user ? user->uuid : ServerInstance->Config->GetSID(), "REHASH", params, user ? user->server : ServerInstance->Config->GetSID()); /// Can this take SID?
 	}
-	Utils->ReadConfiguration(false);
-	InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance);
+
+	// Re-read config stuff
+	Utils->ReadConfiguration(true);
 }
 
 // note: the protocol does not allow direct umode +o except
 // via NICK with 8 params. sending OPERTYPE infers +o modechange
 // locally.
-void ModuleSpanningTree::OnOper(userrec* user, const std::string &opertype)
+void ModuleSpanningTree::OnOper(User* user, const std::string &opertype)
 {
 	if (IS_LOCAL(user))
 	{
@@ -1162,86 +725,52 @@ void ModuleSpanningTree::OnOper(userrec* user, const std::string &opertype)
 	}
 }
 
-void ModuleSpanningTree::OnLine(userrec* source, const std::string &host, bool adding, char linetype, long duration, const std::string &reason)
+void ModuleSpanningTree::OnAddLine(User* user, XLine *x)
 {
-	if (!source)
+	if (!x->IsBurstable())
+		return;
+
+	char data[MAXBUF];
+	snprintf(data,MAXBUF,"%s %s %s %lu %lu :%s", x->type.c_str(), x->Displayable(), 
+	ServerInstance->Config->ServerName, (unsigned long)x->set_time, (unsigned long)x->duration, x->reason);
+	std::deque<std::string> params;
+	params.push_back(data);
+
+	if (!user)
 	{
 		/* Server-set lines */
-		char data[MAXBUF];
-		snprintf(data,MAXBUF,"%c %s %s %lu %lu :%s", linetype, host.c_str(), ServerInstance->Config->ServerName, (unsigned long)ServerInstance->Time(false),
-				(unsigned long)duration, reason.c_str());
-		std::deque<std::string> params;
-		params.push_back(data);
 		Utils->DoOneToMany(ServerInstance->Config->GetSID(), "ADDLINE", params);
 	}
-	else
+	else if (IS_LOCAL(user))
 	{
-		if (IS_LOCAL(source))
-		{
-			char type[8];
-			snprintf(type,8,"%cLINE",linetype);
-			std::string stype = type;
-			if (adding)
-			{
-				char sduration[MAXBUF];
-				snprintf(sduration,MAXBUF,"%ld",duration);
-				std::deque<std::string> params;
-				params.push_back(host);
-				params.push_back(sduration);
-				params.push_back(":"+reason);
-				Utils->DoOneToMany(source->uuid,stype,params);
-			}
-			else
-			{
-				std::deque<std::string> params;
-				params.push_back(host);
-				Utils->DoOneToMany(source->uuid,stype,params);
-			}
-		}
+		/* User-set lines */
+		Utils->DoOneToMany(user->uuid, "ADDLINE", params);
 	}
 }
 
-void ModuleSpanningTree::OnAddGLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask)
-{
-	OnLine(source,hostmask,true,'G',duration,reason);
-}
-	
-void ModuleSpanningTree::OnAddZLine(long duration, userrec* source, const std::string &reason, const std::string &ipmask)
-{
-	OnLine(source,ipmask,true,'Z',duration,reason);
-}
-
-void ModuleSpanningTree::OnAddQLine(long duration, userrec* source, const std::string &reason, const std::string &nickmask)
-{
-	OnLine(source,nickmask,true,'Q',duration,reason);
-}
-
-void ModuleSpanningTree::OnAddELine(long duration, userrec* source, const std::string &reason, const std::string &hostmask)
-{
-	OnLine(source,hostmask,true,'E',duration,reason);
-}
-
-void ModuleSpanningTree::OnDelGLine(userrec* source, const std::string &hostmask)
-{
-	OnLine(source,hostmask,false,'G',0,"");
-}
-
-void ModuleSpanningTree::OnDelZLine(userrec* source, const std::string &ipmask)
+void ModuleSpanningTree::OnDelLine(User* user, XLine *x)
 {
-	OnLine(source,ipmask,false,'Z',0,"");
-}
+	if (x->type == "K")
+		return;
 
-void ModuleSpanningTree::OnDelQLine(userrec* source, const std::string &nickmask)
-{
-	OnLine(source,nickmask,false,'Q',0,"");
-}
+	char data[MAXBUF];
+	snprintf(data,MAXBUF,"%s %s", x->type.c_str(), x->Displayable());
+	std::deque<std::string> params;
+	params.push_back(data);
 
-void ModuleSpanningTree::OnDelELine(userrec* source, const std::string &hostmask)
-{
-	OnLine(source,hostmask,false,'E',0,"");
+	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(userrec* user, void* dest, int target_type, const std::string &text)
+void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const std::string &text)
 {
 	if ((IS_LOCAL(user)) && (user->registered == REG_ALL))
 	{
@@ -1253,14 +782,14 @@ void ModuleSpanningTree::OnMode(userrec* user, void* dest, int target_type, cons
 
 		if (target_type == TYPE_USER)
 		{
-			userrec* u = (userrec*)dest;
+			User* u = (User*)dest;
 			params.push_back(u->uuid);
 			params.push_back(output_text);
 			command = "MODE";
 		}
 		else
 		{
-			chanrec* c = (chanrec*)dest;
+			Channel* c = (Channel*)dest;
 			params.push_back(c->name);
 			params.push_back(ConvToStr(c->age));
 			params.push_back(output_text);
@@ -1271,24 +800,25 @@ void ModuleSpanningTree::OnMode(userrec* user, void* dest, int target_type, cons
 	}
 }
 
-void ModuleSpanningTree::OnSetAway(userrec* user)
+int ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg)
 {
 	if (IS_LOCAL(user))
 	{
-		std::deque<std::string> params;
-		params.push_back(":"+std::string(user->awaymsg));
-		Utils->DoOneToMany(user->uuid,"AWAY",params);
+		if (awaymsg.empty())
+		{
+			std::deque<std::string> params;
+			params.clear();
+			Utils->DoOneToMany(user->uuid,"AWAY",params);
+		}
+		else
+		{
+			std::deque<std::string> params;
+			params.push_back(":" + awaymsg);
+			Utils->DoOneToMany(user->uuid,"AWAY",params);
+		}
 	}
-}
 
-void ModuleSpanningTree::OnCancelAway(userrec* user)
-{
-	if (IS_LOCAL(user))
-	{
-		std::deque<std::string> params;
-		params.clear();
-		Utils->DoOneToMany(user->uuid,"AWAY",params);
-	}
+	return 0;
 }
 
 void ModuleSpanningTree::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline)
@@ -1302,12 +832,12 @@ void ModuleSpanningTree::ProtoSendMode(void* opaque, int target_type, void* targ
 	{
 		if (target_type == TYPE_USER)
 		{
-			userrec* u = (userrec*)target;
+			User* u = (User*)target;
 			s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" FMODE "+u->uuid+" "+ConvToStr(u->age)+" "+output_text);
 		}
 		else
 		{
-			chanrec* c = (chanrec*)target;
+			Channel* c = (Channel*)target;
 			s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+output_text);
 		}
 	}
@@ -1320,12 +850,12 @@ void ModuleSpanningTree::ProtoSendMetaData(void* opaque, int target_type, void*
 	{
 		if (target_type == TYPE_USER)
 		{
-			userrec* u = (userrec*)target;
+			User* u = (User*)target;
 			s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+u->uuid+" "+extname+" :"+extdata);
 		}
 		else if (target_type == TYPE_CHANNEL)
 		{
-			chanrec* c = (chanrec*)target;
+			Channel* c = (Channel*)target;
 			s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+c->name+" "+extname+" :"+extdata);
 		}
 	}
@@ -1337,128 +867,29 @@ void ModuleSpanningTree::ProtoSendMetaData(void* opaque, int target_type, void*
 
 void ModuleSpanningTree::OnEvent(Event* event)
 {
-	std::deque<std::string>* params = (std::deque<std::string>*)event->GetData();
-	if (event->GetEventID() == "send_metadata")
+	if ((event->GetEventID() == "send_encap") || (event->GetEventID() == "send_metadata") || (event->GetEventID() == "send_topic") || (event->GetEventID() == "send_mode") || (event->GetEventID() == "send_mode_explicit") || (event->GetEventID() == "send_opers")
+		|| (event->GetEventID() == "send_modeset") || (event->GetEventID() == "send_snoset") || (event->GetEventID() == "send_push"))
 	{
-		if (params->size() < 3)
-			return;
-		(*params)[2] = ":" + (*params)[2];
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(),"METADATA",*params);
-	}
-	else if (event->GetEventID() == "send_topic")
-	{
-		if (params->size() < 2)
-			return;
-		(*params)[1] = ":" + (*params)[1];
-		params->insert(params->begin() + 1,ServerInstance->Config->ServerName);
-		params->insert(params->begin() + 1,ConvToStr(ServerInstance->Time(true)));
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FTOPIC",*params);
-	}
-	else if (event->GetEventID() == "send_mode")
-	{
-		if (params->size() < 2)
-			return;
-		// Insert the TS value of the object, either userrec or chanrec
-		time_t ourTS = 0;
-		std::string output_text;
-
-		/* Warning: in-place translation is only safe for type TR_NICK */
-		for (size_t n = 0; n < params->size(); n++)
-			ServerInstance->Parser->TranslateUIDs(TR_NICK, (*params)[n], (*params)[n]);
-
-		userrec* a = ServerInstance->FindNick((*params)[0]);
-		if (a)
-		{
-			ourTS = a->age;
-			Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODE",*params);
-			return;
-		}
-		else
-		{
-			chanrec* a = ServerInstance->FindChan((*params)[0]);
-			if (a)
-			{
-				ourTS = a->age;
-				params->insert(params->begin() + 1,ConvToStr(ourTS));
-				Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FMODE",*params);
-			}
-		}
-	}
-	else if (event->GetEventID() == "send_mode_explicit")
-	{
-		if (params->size() < 2)
-			return;
-		std::string output_text;
-
-		/* Warning: in-place translation is only safe for type TR_NICK */
-		for (size_t n = 0; n < params->size(); n++)
-			ServerInstance->Parser->TranslateUIDs(TR_NICK, (*params)[n], (*params)[n]);
-
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODE",*params);
-	}
-	else if (event->GetEventID() == "send_opers")
-	{
-		if (params->size() < 1)
-			return;
-		(*params)[0] = ":" + (*params)[0];
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(),"OPERNOTICE",*params);
-	}
-	else if (event->GetEventID() == "send_modeset")
-	{
-		if (params->size() < 2)
-			return;
-		(*params)[1] = ":" + (*params)[1];
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODENOTICE",*params);
-	}
-	else if (event->GetEventID() == "send_snoset")
-	{
-		if (params->size() < 2)
-			return;
-		(*params)[1] = ":" + (*params)[1];
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(),"SNONOTICE",*params);
-	}
-	else if (event->GetEventID() == "send_push")
-	{
-		if (params->size() < 2)
-			return;
-			
-		userrec *a = ServerInstance->FindNick((*params)[0]);
-			
-		if (!a)
-			return;
-
-		(*params)[0] = a->uuid;
-		(*params)[1] = ":" + (*params)[1];
-		Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH", *params, a->server);
+		ServerInstance->Logs->Log("m_spanningtree", DEBUG, "WARNING: Deprecated use of old 1.1 style m_spanningtree event ignored, type '"+event->GetEventID()+"'!");
 	}
 }
 
 ModuleSpanningTree::~ModuleSpanningTree()
 {
 	/* This will also free the listeners */
+	delete ServerInstance->PI;
+	ServerInstance->PI = new ProtocolInterface(ServerInstance);
+
 	delete Utils;
-	if (SyncTimer)
-		ServerInstance->Timers->DelTimer(SyncTimer);
 
 	ServerInstance->Timers->DelTimer(RefreshTimer);
 
-	ServerInstance->DoneWithInterface("InspSocketHook");
+	ServerInstance->Modules->DoneWithInterface("BufferedSocketHook");
 }
 
 Version ModuleSpanningTree::GetVersion()
 {
-	return Version(1,1,0,2,VF_VENDOR,API_VERSION);
-}
-
-void ModuleSpanningTree::Implements(char* List)
-{
-	List[I_OnPreCommand] = List[I_OnGetServerDescription] = List[I_OnUserInvite] = List[I_OnPostLocalTopicChange] = 1;
-	List[I_OnWallops] = List[I_OnUserNotice] = List[I_OnUserMessage] = List[I_OnBackgroundTimer] = 1;
-	List[I_OnUserJoin] = List[I_OnChangeHost] = List[I_OnChangeName] = List[I_OnUserPart] = List[I_OnUserConnect] = 1;
-	List[I_OnUserQuit] = List[I_OnUserPostNick] = List[I_OnUserKick] = List[I_OnRemoteKill] = List[I_OnRehash] = 1;
-	List[I_OnOper] = List[I_OnAddGLine] = List[I_OnAddZLine] = List[I_OnAddQLine] = List[I_OnAddELine] = 1;
-	List[I_OnDelGLine] = List[I_OnDelZLine] = List[I_OnDelQLine] = List[I_OnDelELine] = List[I_ProtoSendMode] = List[I_OnMode] = 1;
-	List[I_OnStats] = List[I_ProtoSendMetaData] = List[I_OnEvent] = List[I_OnSetAway] = List[I_OnCancelAway] = List[I_OnPostCommand] = 1;
+	return Version(1,2,0,2,VF_VENDOR,API_VERSION);
 }
 
 /* It is IMPORTANT that m_spanningtree is the last module in the chain
@@ -1468,10 +899,9 @@ void ModuleSpanningTree::Implements(char* List)
  * Therefore, we return PRIORITY_LAST to make sure we end up at the END of
  * the module call queue.
  */
-Priority ModuleSpanningTree::Prioritize()
+void ModuleSpanningTree::Prioritize()
 {
-	return PRIORITY_LAST;
+	ServerInstance->Modules->SetPriority(this, PRIO_LAST);
 }
 
 MODULE_INIT(ModuleSpanningTree)
-