Split more of treesocket1

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8812 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 388 insertions, 322 deletions

diff --git a/src/modules/m_spanningtree/burst.cpp b/src/modules/m_spanningtree/burst.cpp
new file mode 100644
index 000000000..e32f9f3ff
--- /dev/null
+++ b/src/modules/m_spanningtree/burst.cpp
@@ -0,0 +1,258 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
+#include "commands/cmd_whois.h"
+#include "commands/cmd_stats.h"
+#include "socket.h"
+#include "wildcard.h"
+#include "xline.h"
+#include "transport.h"
+#include "m_hash.h"
+#include "socketengine.h"
+
+#include "m_spanningtree/main.h"
+#include "m_spanningtree/utils.h"
+#include "m_spanningtree/treeserver.h"
+#include "m_spanningtree/link.h"
+#include "m_spanningtree/treesocket.h"
+#include "m_spanningtree/resolvers.h"
+#include "m_spanningtree/handshaketimer.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_hash.h */
+
+/** This function is called when we want to send a netburst to a local
+ * server. There is a set order we must do this, because for example
+ * users require their servers to exist, and channels require their
+ * users to exist. You get the idea.
+ */
+void TreeSocket::DoBurst(TreeServer* s)
+{
+	std::string name = s->GetName();
+	std::string burst = ":" + this->Instance->Config->GetSID() + " BURST " +ConvToStr(Instance->Time(true));
+	std::string endburst = ":" + this->Instance->Config->GetSID() + " ENDBURST";
+	this->Instance->SNO->WriteToSnoMask('l',"Bursting to \2%s\2 (Authentication: %s).", name.c_str(), this->GetTheirChallenge().empty() ? "plaintext password" : "SHA256-HMAC challenge-response");
+	this->WriteLine(burst);
+	/* send our version string */
+	this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" VERSION :"+this->Instance->GetVersionString());
+	/* Send server tree */
+	this->SendServers(Utils->TreeRoot,s,1);
+	/* Send users and their oper status */
+	this->SendUsers(s);
+	/* Send everything else (channel modes, xlines etc) */
+	this->SendChannelModes(s);
+	this->SendXLines(s);
+	FOREACH_MOD_I(this->Instance,I_OnSyncOtherMetaData,OnSyncOtherMetaData((Module*)Utils->Creator,(void*)this));
+	this->WriteLine(endburst);
+	this->Instance->SNO->WriteToSnoMask('l',"Finished bursting to \2"+name+"\2.");
+}
+
+/** Recursively send the server tree with distances as hops.
+ * This is used during network burst to inform the other server
+ * (and any of ITS servers too) of what servers we know about.
+ * If at any point any of these servers already exist on the other
+ * end, our connection may be terminated. The hopcounts given
+ * by this function are relative, this doesn't matter so long as
+ * they are all >1, as all the remote servers re-calculate them
+ * to be relative too, with themselves as hop 0.
+ */
+void TreeSocket::SendServers(TreeServer* Current, TreeServer* s, int hops)
+{
+	char command[1024];
+	for (unsigned int q = 0; q < Current->ChildCount(); q++)
+	{
+		TreeServer* recursive_server = Current->GetChild(q);
+		if (recursive_server != s)
+		{
+			snprintf(command,1024,":%s SERVER %s * %d %s :%s",Current->GetName().c_str(),recursive_server->GetName().c_str(),hops,
+					recursive_server->GetID().c_str(),
+					recursive_server->GetDesc().c_str());
+			this->WriteLine(command);
+			this->WriteLine(":"+recursive_server->GetName()+" VERSION :"+recursive_server->GetVersion());
+			/* down to next level */
+			this->SendServers(recursive_server, s, hops+1);
+		}
+	}
+}
+
+/** Send one or more FJOINs for a channel of users.
+ * If the length of a single line is more than 480-NICKMAX
+ * in length, it is split over multiple lines.
+ */
+void TreeSocket::SendFJoins(TreeServer* Current, Channel* c)
+{
+	std::string buffer;
+	char list[MAXBUF];
+	std::string individual_halfops = std::string(":")+this->Instance->Config->GetSID()+" FMODE "+c->name+" "+ConvToStr(c->age);
+
+	size_t dlen, curlen;
+	dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu",this->Instance->Config->GetSID().c_str(),c->name,(unsigned long)c->age);
+	int numusers = 1;
+	char* ptr = list + dlen;
+
+	CUList *ulist = c->GetUsers();
+	std::string modes;
+	std::string params;
+
+	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+	{
+		// The first parameter gets a : before it
+		size_t ptrlen = snprintf(ptr, MAXBUF, " %s%s,%s", !numusers ? ":" : "", c->GetAllPrefixChars(i->first), i->first->uuid);
+
+		curlen += ptrlen;
+		ptr += ptrlen;
+
+		numusers++;
+
+		if (curlen > (480-NICKMAX))
+		{
+			buffer.append(list).append("\r\n");
+			dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu",this->Instance->Config->GetSID().c_str(),c->name,(unsigned long)c->age);
+			ptr = list + dlen;
+			ptrlen = 0;
+			numusers = 0;
+		}
+	}
+
+	if (numusers)
+		buffer.append(list).append("\r\n");
+
+	buffer.append(":").append(this->Instance->Config->GetSID()).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(c->ChanModes(true)).append("\r\n");
+
+	int linesize = 1;
+	for (BanList::iterator b = c->bans.begin(); b != c->bans.end(); b++)
+	{
+		int size = strlen(b->data) + 2;
+		int currsize = linesize + size;
+		if (currsize <= 350)
+		{
+			modes.append("b");
+			params.append(" ").append(b->data);
+			linesize += size; 
+		}
+		if ((params.length() >= MAXMODES) || (currsize > 350))
+		{
+			/* Wrap at MAXMODES */
+			buffer.append(":").append(this->Instance->Config->GetSID()).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(modes).append(params).append("\r\n");
+			modes.clear();
+			params.clear();
+			linesize = 1;
+		}
+	}
+
+	/* Only send these if there are any */
+	if (!modes.empty())
+		buffer.append(":").append(this->Instance->Config->GetSID()).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(modes).append(params);
+
+	this->WriteLine(buffer);
+}
+
+/** Send G, Q, Z and E lines */
+void TreeSocket::SendXLines(TreeServer* Current)
+{
+	char data[MAXBUF];
+	std::string buffer;
+	std::string n = this->Instance->Config->GetSID();
+	const char* sn = n.c_str();
+
+	std::vector<std::string> types = Instance->XLines->GetAllTypes();
+
+	for (std::vector<std::string>::iterator it = types.begin(); it != types.end(); ++it)
+	{
+		XLineLookup* lookup = Instance->XLines->GetAll(*it);
+
+		if (lookup)
+		{
+			for (LookupIter i = lookup->begin(); i != lookup->end(); ++i)
+			{
+				snprintf(data,MAXBUF,":%s ADDLINE %s %s %s %lu %lu :%s\r\n",sn, it->c_str(), i->second->Displayable(),
+						i->second->source,
+						(unsigned long)i->second->set_time,
+						(unsigned long)i->second->duration,
+						i->second->reason);
+				buffer.append(data);
+			}
+		}
+	}
+
+	if (!buffer.empty())
+		this->WriteLine(buffer);
+}
+
+/** Send channel modes and topics */
+void TreeSocket::SendChannelModes(TreeServer* Current)
+{
+	char data[MAXBUF];
+	std::deque<std::string> list;
+	std::string n = this->Instance->Config->GetSID();
+	const char* sn = n.c_str();
+	Instance->Log(DEBUG,"Sending channels and modes, %d to send", this->Instance->chanlist->size());
+	for (chan_hash::iterator c = this->Instance->chanlist->begin(); c != this->Instance->chanlist->end(); c++)
+	{
+		SendFJoins(Current, c->second);
+		if (*c->second->topic)
+		{
+			snprintf(data,MAXBUF,":%s FTOPIC %s %lu %s :%s",sn,c->second->name,(unsigned long)c->second->topicset,c->second->setby,c->second->topic);
+			this->WriteLine(data);
+		}
+		FOREACH_MOD_I(this->Instance,I_OnSyncChannel,OnSyncChannel(c->second,(Module*)Utils->Creator,(void*)this));
+		list.clear();
+		c->second->GetExtList(list);
+		for (unsigned int j = 0; j < list.size(); j++)
+		{
+			FOREACH_MOD_I(this->Instance,I_OnSyncChannelMetaData,OnSyncChannelMetaData(c->second,(Module*)Utils->Creator,(void*)this,list[j]));
+		}
+	}
+}
+
+/** send all users and their oper state/modes */
+void TreeSocket::SendUsers(TreeServer* Current)
+{
+	char data[MAXBUF];
+	std::deque<std::string> list;
+	std::string dataline;
+	for (user_hash::iterator u = this->Instance->Users->clientlist->begin(); u != this->Instance->Users->clientlist->end(); u++)
+	{
+		if (u->second->registered == REG_ALL)
+		{
+			TreeServer* theirserver = Utils->FindServer(u->second->server);
+			if (theirserver)
+			{
+				snprintf(data,MAXBUF,":%s UID %s %lu %s %s %s %s +%s %s %lu :%s", theirserver->GetID().c_str(), u->second->uuid,
+						(unsigned long)u->second->age, u->second->nick, u->second->host, u->second->dhost,
+						u->second->ident, u->second->FormatModes(), u->second->GetIPString(),
+						(unsigned long)u->second->signon, u->second->fullname);
+				this->WriteLine(data);
+				if (*u->second->oper)
+				{
+					snprintf(data,MAXBUF,":%s OPERTYPE %s", u->second->uuid, u->second->oper);
+					this->WriteLine(data);
+				}
+				if (*u->second->awaymsg)
+				{
+					snprintf(data,MAXBUF,":%s AWAY :%s", u->second->uuid, u->second->awaymsg);
+					this->WriteLine(data);
+				}
+			}
+
+			FOREACH_MOD_I(this->Instance,I_OnSyncUser,OnSyncUser(u->second,(Module*)Utils->Creator,(void*)this));
+			list.clear();
+			u->second->GetExtList(list);
+			for (unsigned int j = 0; j < list.size(); j++)
+			{
+				FOREACH_MOD_I(this->Instance,I_OnSyncUserMetaData,OnSyncUserMetaData(u->second,(Module*)Utils->Creator,(void*)this,list[j]));
+			}
+		}
+	}
+}
+
diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp
new file mode 100644
index 000000000..1aa2afddb
--- /dev/null
+++ b/src/modules/m_spanningtree/hmac.cpp
@@ -0,0 +1,130 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
+#include "commands/cmd_whois.h"
+#include "commands/cmd_stats.h"
+#include "socket.h"
+#include "wildcard.h"
+#include "xline.h"
+#include "transport.h"
+#include "m_hash.h"
+#include "socketengine.h"
+
+#include "m_spanningtree/main.h"
+#include "m_spanningtree/utils.h"
+#include "m_spanningtree/treeserver.h"
+#include "m_spanningtree/link.h"
+#include "m_spanningtree/treesocket.h"
+#include "m_spanningtree/resolvers.h"
+#include "m_spanningtree/handshaketimer.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_hash.h */
+
+const std::string& TreeSocket::GetOurChallenge()
+{
+	return this->ourchallenge;
+}
+
+void TreeSocket::SetOurChallenge(const std::string &c)
+{
+	this->ourchallenge = c;
+}
+
+const std::string& TreeSocket::GetTheirChallenge()
+{
+	return this->theirchallenge;
+}
+
+void TreeSocket::SetTheirChallenge(const std::string &c)
+{
+	this->theirchallenge = c;
+}
+
+std::string TreeSocket::MakePass(const std::string &password, const std::string &challenge)
+{
+	/* This is a simple (maybe a bit hacky?) HMAC algorithm, thanks to jilles for
+	 * suggesting the use of HMAC to secure the password against various attacks.
+	 *
+	 * Note: If m_sha256.so is not loaded, we MUST fall back to plaintext with no
+	 *       HMAC challenge/response.
+	 */
+	Module* sha256 = Instance->Modules->Find("m_sha256.so");
+	if (Utils->ChallengeResponse && sha256 && !challenge.empty())
+	{
+		/* XXX: This is how HMAC is supposed to be done:
+		 *
+		 * sha256( (pass xor 0x5c) + sha256((pass xor 0x36) + m) )
+		 *
+		 * Note that we are encoding the hex hash, not the binary
+		 * output of the hash which is slightly different to standard.
+		 *
+		 * Don't ask me why its always 0x5c and 0x36... it just is.
+		 */
+		std::string hmac1, hmac2;
+
+		for (size_t n = 0; n < password.length(); n++)
+		{
+			hmac1 += static_cast<char>(password[n] ^ 0x5C);
+			hmac2 += static_cast<char>(password[n] ^ 0x36);
+		}
+
+		hmac2 += challenge;
+		HashResetRequest(Utils->Creator, sha256).Send();
+		hmac2 = HashSumRequest(Utils->Creator, sha256, hmac2).Send();
+
+		HashResetRequest(Utils->Creator, sha256).Send();
+		std::string hmac = hmac1 + hmac2;
+		hmac = HashSumRequest(Utils->Creator, sha256, hmac).Send();
+
+		return "HMAC-SHA256:"+ hmac;
+	}
+	else if (!challenge.empty() && !sha256)
+		Instance->Log(DEFAULT,"Not authenticating to server using SHA256/HMAC because we don't have m_sha256 loaded!");
+
+	return password;
+}
+
+std::string TreeSocket::RandString(unsigned int length)
+{
+	char* randombuf = new char[length+1];
+	std::string out;
+#ifdef WINDOWS
+	int fd = -1;
+#else
+	int fd = open("/dev/urandom", O_RDONLY, 0);
+#endif
+
+	if (fd >= 0)
+	{
+#ifndef WINDOWS
+		read(fd, randombuf, length);
+		close(fd);
+#endif
+	}
+	else
+	{
+		for (unsigned int i = 0; i < length; i++)
+			randombuf[i] = rand();
+	}
+
+	for (unsigned int i = 0; i < length; i++)
+	{
+		char randchar = static_cast<char>((randombuf[i] & 0x7F) | 0x21);
+		out += (randchar == '=' ? '_' : randchar);
+	}
+
+	delete[] randombuf;
+	return out;
+}
+
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 2a50b50e5..3e129a642 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -95,70 +95,6 @@ TreeSocket::~TreeSocket()
 		BufferedSocketUnhookRequest(this, (Module*)Utils->Creator, Hook).Send();
 }
 
-const std::string& TreeSocket::GetOurChallenge()
-{
-	return this->ourchallenge;
-}
-
-void TreeSocket::SetOurChallenge(const std::string &c)
-{
-	this->ourchallenge = c;
-}
-
-const std::string& TreeSocket::GetTheirChallenge()
-{
-	return this->theirchallenge;
-}
-
-void TreeSocket::SetTheirChallenge(const std::string &c)
-{
-	this->theirchallenge = c;
-}
-
-std::string TreeSocket::MakePass(const std::string &password, const std::string &challenge)
-{
-	/* This is a simple (maybe a bit hacky?) HMAC algorithm, thanks to jilles for
-	 * suggesting the use of HMAC to secure the password against various attacks.
-	 *
-	 * Note: If m_sha256.so is not loaded, we MUST fall back to plaintext with no
-	 *       HMAC challenge/response.
-	 */
-	Module* sha256 = Instance->Modules->Find("m_sha256.so");
-	if (Utils->ChallengeResponse && sha256 && !challenge.empty())
-	{
-		/* XXX: This is how HMAC is supposed to be done:
-		 *
-		 * sha256( (pass xor 0x5c) + sha256((pass xor 0x36) + m) )
-		 *
-		 * Note that we are encoding the hex hash, not the binary
-		 * output of the hash which is slightly different to standard.
-		 *
-		 * Don't ask me why its always 0x5c and 0x36... it just is.
-		 */
-		std::string hmac1, hmac2;
-
-		for (size_t n = 0; n < password.length(); n++)
-		{
-			hmac1 += static_cast<char>(password[n] ^ 0x5C);
-			hmac2 += static_cast<char>(password[n] ^ 0x36);
-		}
-
-		hmac2 += challenge;
-		HashResetRequest(Utils->Creator, sha256).Send();
-		hmac2 = HashSumRequest(Utils->Creator, sha256, hmac2).Send();
-
-		HashResetRequest(Utils->Creator, sha256).Send();
-		std::string hmac = hmac1 + hmac2;
-		hmac = HashSumRequest(Utils->Creator, sha256, hmac).Send();
-
-		return "HMAC-SHA256:"+ hmac;
-	}
-	else if (!challenge.empty() && !sha256)
-		Instance->Log(DEFAULT,"Not authenticating to server using SHA256/HMAC because we don't have m_sha256 loaded!");
-
-	return password;
-}
-
 /** When an outbound connection finishes connecting, we receive
  * this event, and must send our SERVER string to the other
  * side. If the other side is happy, as outlined in the server
@@ -245,67 +181,6 @@ int TreeSocket::OnDisconnect()
 	return true;
 }
 
-/** Recursively send the server tree with distances as hops.
- * This is used during network burst to inform the other server
- * (and any of ITS servers too) of what servers we know about.
- * If at any point any of these servers already exist on the other
- * end, our connection may be terminated. The hopcounts given
- * by this function are relative, this doesn't matter so long as
- * they are all >1, as all the remote servers re-calculate them
- * to be relative too, with themselves as hop 0.
- */
-void TreeSocket::SendServers(TreeServer* Current, TreeServer* s, int hops)
-{
-	char command[1024];
-	for (unsigned int q = 0; q < Current->ChildCount(); q++)
-	{
-		TreeServer* recursive_server = Current->GetChild(q);
-		if (recursive_server != s)
-		{
-			snprintf(command,1024,":%s SERVER %s * %d %s :%s",Current->GetName().c_str(),recursive_server->GetName().c_str(),hops,
-					recursive_server->GetID().c_str(),
-					recursive_server->GetDesc().c_str());
-			this->WriteLine(command);
-			this->WriteLine(":"+recursive_server->GetName()+" VERSION :"+recursive_server->GetVersion());
-			/* down to next level */
-			this->SendServers(recursive_server, s, hops+1);
-		}
-	}
-}
-
-std::string TreeSocket::RandString(unsigned int length)
-{
-	char* randombuf = new char[length+1];
-	std::string out;
-#ifdef WINDOWS
-	int fd = -1;
-#else
-	int fd = open("/dev/urandom", O_RDONLY, 0);
-#endif
-
-	if (fd >= 0)
-	{
-#ifndef WINDOWS
-		read(fd, randombuf, length);
-		close(fd);
-#endif
-	}
-	else
-	{
-		for (unsigned int i = 0; i < length; i++)
-			randombuf[i] = rand();
-	}
-
-	for (unsigned int i = 0; i < length; i++)
-	{
-		char randchar = static_cast<char>((randombuf[i] & 0x7F) | 0x21);
-		out += (randchar == '=' ? '_' : randchar);
-	}
-
-	delete[] randombuf;
-	return out;
-}
-
 void TreeSocket::SendError(const std::string &errormessage)
 {
 	/* Display the error locally as well as sending it remotely */
@@ -373,203 +248,6 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
 		Instance->Log(DEFAULT,"Squit from unknown server");
 }
 
-/** Send one or more FJOINs for a channel of users.
- * If the length of a single line is more than 480-NICKMAX
- * in length, it is split over multiple lines.
- */
-void TreeSocket::SendFJoins(TreeServer* Current, Channel* c)
-{
-	std::string buffer;
-	char list[MAXBUF];
-	std::string individual_halfops = std::string(":")+this->Instance->Config->GetSID()+" FMODE "+c->name+" "+ConvToStr(c->age);
-
-	size_t dlen, curlen;
-	dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu",this->Instance->Config->GetSID().c_str(),c->name,(unsigned long)c->age);
-	int numusers = 1;
-	char* ptr = list + dlen;
-
-	CUList *ulist = c->GetUsers();
-	std::string modes;
-	std::string params;
-
-	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-	{
-		// The first parameter gets a : before it
-		size_t ptrlen = snprintf(ptr, MAXBUF, " %s%s,%s", !numusers ? ":" : "", c->GetAllPrefixChars(i->first), i->first->uuid);
-
-		curlen += ptrlen;
-		ptr += ptrlen;
-
-		numusers++;
-
-		if (curlen > (480-NICKMAX))
-		{
-			buffer.append(list).append("\r\n");
-			dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu",this->Instance->Config->GetSID().c_str(),c->name,(unsigned long)c->age);
-			ptr = list + dlen;
-			ptrlen = 0;
-			numusers = 0;
-		}
-	}
-
-	if (numusers)
-		buffer.append(list).append("\r\n");
-
-	buffer.append(":").append(this->Instance->Config->GetSID()).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(c->ChanModes(true)).append("\r\n");
-
-	int linesize = 1;
-	for (BanList::iterator b = c->bans.begin(); b != c->bans.end(); b++)
-	{
-		int size = strlen(b->data) + 2;
-		int currsize = linesize + size;
-		if (currsize <= 350)
-		{
-			modes.append("b");
-			params.append(" ").append(b->data);
-			linesize += size; 
-		}
-		if ((params.length() >= MAXMODES) || (currsize > 350))
-		{
-			/* Wrap at MAXMODES */
-			buffer.append(":").append(this->Instance->Config->GetSID()).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(modes).append(params).append("\r\n");
-			modes.clear();
-			params.clear();
-			linesize = 1;
-		}
-	}
-
-	/* Only send these if there are any */
-	if (!modes.empty())
-		buffer.append(":").append(this->Instance->Config->GetSID()).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(modes).append(params);
-
-	this->WriteLine(buffer);
-}
-
-/** Send G, Q, Z and E lines */
-void TreeSocket::SendXLines(TreeServer* Current)
-{
-	char data[MAXBUF];
-	std::string buffer;
-	std::string n = this->Instance->Config->GetSID();
-	const char* sn = n.c_str();
-
-	std::vector<std::string> types = Instance->XLines->GetAllTypes();
-
-	for (std::vector<std::string>::iterator it = types.begin(); it != types.end(); ++it)
-	{
-		XLineLookup* lookup = Instance->XLines->GetAll(*it);
-
-		if (lookup)
-		{
-			for (LookupIter i = lookup->begin(); i != lookup->end(); ++i)
-			{
-				snprintf(data,MAXBUF,":%s ADDLINE %s %s %s %lu %lu :%s\r\n",sn, it->c_str(), i->second->Displayable(),
-						i->second->source,
-						(unsigned long)i->second->set_time,
-						(unsigned long)i->second->duration,
-						i->second->reason);
-				buffer.append(data);
-			}
-		}
-	}
-
-	if (!buffer.empty())
-		this->WriteLine(buffer);
-}
-
-/** Send channel modes and topics */
-void TreeSocket::SendChannelModes(TreeServer* Current)
-{
-	char data[MAXBUF];
-	std::deque<std::string> list;
-	std::string n = this->Instance->Config->GetSID();
-	const char* sn = n.c_str();
-	Instance->Log(DEBUG,"Sending channels and modes, %d to send", this->Instance->chanlist->size());
-	for (chan_hash::iterator c = this->Instance->chanlist->begin(); c != this->Instance->chanlist->end(); c++)
-	{
-		SendFJoins(Current, c->second);
-		if (*c->second->topic)
-		{
-			snprintf(data,MAXBUF,":%s FTOPIC %s %lu %s :%s",sn,c->second->name,(unsigned long)c->second->topicset,c->second->setby,c->second->topic);
-			this->WriteLine(data);
-		}
-		FOREACH_MOD_I(this->Instance,I_OnSyncChannel,OnSyncChannel(c->second,(Module*)Utils->Creator,(void*)this));
-		list.clear();
-		c->second->GetExtList(list);
-		for (unsigned int j = 0; j < list.size(); j++)
-		{
-			FOREACH_MOD_I(this->Instance,I_OnSyncChannelMetaData,OnSyncChannelMetaData(c->second,(Module*)Utils->Creator,(void*)this,list[j]));
-		}
-	}
-}
-
-/** send all users and their oper state/modes */
-void TreeSocket::SendUsers(TreeServer* Current)
-{
-	char data[MAXBUF];
-	std::deque<std::string> list;
-	std::string dataline;
-	for (user_hash::iterator u = this->Instance->Users->clientlist->begin(); u != this->Instance->Users->clientlist->end(); u++)
-	{
-		if (u->second->registered == REG_ALL)
-		{
-			TreeServer* theirserver = Utils->FindServer(u->second->server);
-			if (theirserver)
-			{
-				snprintf(data,MAXBUF,":%s UID %s %lu %s %s %s %s +%s %s %lu :%s", theirserver->GetID().c_str(), u->second->uuid,
-						(unsigned long)u->second->age, u->second->nick, u->second->host, u->second->dhost,
-						u->second->ident, u->second->FormatModes(), u->second->GetIPString(),
-						(unsigned long)u->second->signon, u->second->fullname);
-				this->WriteLine(data);
-				if (*u->second->oper)
-				{
-					snprintf(data,MAXBUF,":%s OPERTYPE %s", u->second->uuid, u->second->oper);
-					this->WriteLine(data);
-				}
-				if (*u->second->awaymsg)
-				{
-					snprintf(data,MAXBUF,":%s AWAY :%s", u->second->uuid, u->second->awaymsg);
-					this->WriteLine(data);
-				}
-			}
-
-			FOREACH_MOD_I(this->Instance,I_OnSyncUser,OnSyncUser(u->second,(Module*)Utils->Creator,(void*)this));
-			list.clear();
-			u->second->GetExtList(list);
-			for (unsigned int j = 0; j < list.size(); j++)
-			{
-				FOREACH_MOD_I(this->Instance,I_OnSyncUserMetaData,OnSyncUserMetaData(u->second,(Module*)Utils->Creator,(void*)this,list[j]));
-			}
-		}
-	}
-}
-
-/** This function is called when we want to send a netburst to a local
- * server. There is a set order we must do this, because for example
- * users require their servers to exist, and channels require their
- * users to exist. You get the idea.
- */
-void TreeSocket::DoBurst(TreeServer* s)
-{
-	std::string name = s->GetName();
-	std::string burst = ":" + this->Instance->Config->GetSID() + " BURST " +ConvToStr(Instance->Time(true));
-	std::string endburst = ":" + this->Instance->Config->GetSID() + " ENDBURST";
-	this->Instance->SNO->WriteToSnoMask('l',"Bursting to \2%s\2 (Authentication: %s).", name.c_str(), this->GetTheirChallenge().empty() ? "plaintext password" : "SHA256-HMAC challenge-response");
-	this->WriteLine(burst);
-	/* send our version string */
-	this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" VERSION :"+this->Instance->GetVersionString());
-	/* Send server tree */
-	this->SendServers(Utils->TreeRoot,s,1);
-	/* Send users and their oper status */
-	this->SendUsers(s);
-	/* Send everything else (channel modes, xlines etc) */
-	this->SendChannelModes(s);
-	this->SendXLines(s);
-	FOREACH_MOD_I(this->Instance,I_OnSyncOtherMetaData,OnSyncOtherMetaData((Module*)Utils->Creator,(void*)this));
-	this->WriteLine(endburst);
-	this->Instance->SNO->WriteToSnoMask('l',"Finished bursting to \2"+name+"\2.");
-}
-
 /** This function is called when we receive data from a remote
  * server. We buffer the data in a std::string (it doesnt stay
  * there for long), reading using BufferedSocket::Read() which can