1 files changed, 75 insertions, 54 deletions

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index c9729cc0f..931bd3f9f 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -21,46 +21,30 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "xline.h"
-#include "socketengine.h"
+#include "iohook.h"
 
 #include "main.h"
-#include "../spanningtree.h"
+#include "modules/spanningtree.h"
 #include "utils.h"
 #include "treeserver.h"
 #include "link.h"
 #include "treesocket.h"
-#include "resolvers.h"
+#include "commands.h"
 
 /** Because most of the I/O gubbins are encapsulated within
  * BufferedSocket, we just call the superclass constructor for
  * most of the action, and append a few of our own values
  * to it.
  */
-TreeSocket::TreeSocket(SpanningTreeUtilities* Util, Link* link, Autoconnect* myac, const std::string& ipaddr)
-	: Utils(Util)
+TreeSocket::TreeSocket(Link* link, Autoconnect* myac, const std::string& ipaddr)
+	: linkID(assign(link->Name)), LinkState(CONNECTING), MyRoot(NULL), proto_version(0), ConnectionFailureShown(false)
+	, age(ServerInstance->Time())
 {
-	age = ServerInstance->Time();
-	linkID = assign(link->Name);
 	capab = new CapabData;
 	capab->link = link;
 	capab->ac = myac;
 	capab->capab_phase = 0;
-	MyRoot = NULL;
-	proto_version = 0;
-	ConnectionFailureShown = false;
-	LinkState = CONNECTING;
-	if (!link->Hook.empty())
-	{
-		ServiceProvider* prov = ServerInstance->Modules->FindService(SERVICE_IOHOOK, link->Hook);
-		if (!prov)
-		{
-			SetError("Could not find hook '" + link->Hook + "' for connection to " + linkID);
-			return;
-		}
-		AddIOHook(prov->creator);
-	}
+
 	DoConnect(ipaddr, link->Port, link->Timeout, link->Bind);
 	Utils->timeoutlist[this] = std::pair<std::string, int>(linkID, link->Timeout);
 	SendCapabilities(1);
@@ -70,21 +54,16 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, Link* link, Autoconnect* mya
  * we must associate it with a socket without creating a new
  * connection. This constructor is used for this purpose.
  */
-TreeSocket::TreeSocket(SpanningTreeUtilities* Util, int newfd, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
-	: BufferedSocket(newfd), Utils(Util)
+TreeSocket::TreeSocket(int newfd, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
+	: BufferedSocket(newfd)
+	, linkID("inbound from " + client->addr()), LinkState(WAIT_AUTH_1), MyRoot(NULL), proto_version(0)
+	, ConnectionFailureShown(false), age(ServerInstance->Time())
 {
 	capab = new CapabData;
 	capab->capab_phase = 0;
-	MyRoot = NULL;
-	age = ServerInstance->Time();
-	LinkState = WAIT_AUTH_1;
-	proto_version = 0;
-	ConnectionFailureShown = false;
-	linkID = "inbound from " + client->addr();
 
-	FOREACH_MOD(I_OnHookIO, OnHookIO(this, via));
-	if (GetIOHook())
-		GetIOHook()->OnStreamSocketAccept(this, client, server);
+	if (via->iohookprov)
+		via->iohookprov->OnAccept(this, client, server);
 	SendCapabilities(1);
 
 	Utils->timeoutlist[this] = std::pair<std::string, int>(linkID, 30);
@@ -114,8 +93,7 @@ CullResult TreeSocket::cull()
 
 TreeSocket::~TreeSocket()
 {
-	if (capab)
-		delete capab;
+	delete capab;
 }
 
 /** When an outbound connection finishes connecting, we receive
@@ -128,6 +106,17 @@ void TreeSocket::OnConnected()
 {
 	if (this->LinkState == CONNECTING)
 	{
+		if (!capab->link->Hook.empty())
+		{
+			ServiceProvider* prov = ServerInstance->Modules->FindService(SERVICE_IOHOOK, capab->link->Hook);
+			if (!prov)
+			{
+				SetError("Could not find hook '" + capab->link->Hook + "' for connection to " + linkID);
+				return;
+			}
+			static_cast<IOHookProvider*>(prov)->OnConnect(this);
+		}
+
 		ServerInstance->SNO->WriteGlobalSno('l', "Connection to \2%s\2[%s] started.", linkID.c_str(),
 			(capab->link->HiddenFromStats ? "<hidden>" : capab->link->IPAddr.c_str()));
 		this->SendCapabilities(1);
@@ -157,16 +146,15 @@ void TreeSocket::SendError(const std::string &errormessage)
  */
 void TreeSocket::SquitServer(std::string &from, TreeServer* Current, int& num_lost_servers, int& num_lost_users)
 {
-	std::string servername = Current->GetName();
-	ServerInstance->Logs->Log("m_spanningtree",DEBUG,"SquitServer for %s from %s",
-		servername.c_str(), from.c_str());
+	ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "SquitServer for %s from %s", Current->GetName().c_str(), from.c_str());
 	/* recursively squit the servers attached to 'Current'.
 	 * We're going backwards so we don't remove users
 	 * while we still need them ;)
 	 */
-	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)
 	{
-		TreeServer* recursive_server = Current->GetChild(q);
+		TreeServer* recursive_server = *i;
 		this->SquitServer(from,recursive_server, num_lost_servers, num_lost_users);
 	}
 	/* Now we've whacked the kids, whack self */
@@ -182,22 +170,21 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
 {
 	bool LocalSquit = false;
 
-	if ((Current) && (Current != Utils->TreeRoot))
+	if (!Current->IsRoot())
 	{
 		DelServerEvent(Utils->Creator, Current->GetName());
 
-		if (!Current->GetSocket() || Current->GetSocket()->Introduced())
-		{
-			parameterlist params;
-			params.push_back(Current->GetID());
-			params.push_back(":"+reason);
-			Utils->DoOneToAllButSender(Current->GetParent()->GetID(),"SQUIT",params,Current->GetID());
-		}
-
-		if (Current->GetParent() == Utils->TreeRoot)
+		if (Current->IsLocal())
 		{
 			ServerInstance->SNO->WriteGlobalSno('l', "Server \002"+Current->GetName()+"\002 split: "+reason);
 			LocalSquit = true;
+			if (Current->GetSocket()->Introduced())
+			{
+				CmdBuilder params("SQUIT");
+				params.push_back(Current->GetID());
+				params.push_last(reason);
+				params.Broadcast();
+			}
 		}
 		else
 		{
@@ -206,7 +193,12 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
 		int num_lost_servers = 0;
 		int num_lost_users = 0;
 		std::string from = Current->GetParent()->GetName()+" "+Current->GetName();
+
+		ModuleSpanningTree* st = Utils->Creator;
+		st->SplitInProgress = true;
 		SquitServer(from, Current, num_lost_servers, num_lost_users);
+		st->SplitInProgress = false;
+
 		ServerInstance->SNO->WriteToSnoMask(LocalSquit ? 'l' : 'L', "Netsplit complete, lost \002%d\002 user%s on \002%d\002 server%s.",
 			num_lost_users, num_lost_users != 1 ? "s" : "", num_lost_servers, num_lost_servers != 1 ? "s" : "");
 		Current->Tidy();
@@ -220,8 +212,26 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
 			Close();
 		}
 	}
-	else
-		ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Squit from unknown server");
+}
+
+CmdResult CommandSQuit::HandleServer(TreeServer* server, std::vector<std::string>& params)
+{
+	TreeServer* quitting = Utils->FindServer(params[0]);
+	if (!quitting)
+	{
+		ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Squit from unknown server");
+		return CMD_FAILURE;
+	}
+
+	TreeSocket* sock = server->GetSocket();
+	sock->Squit(quitting, params[1]);
+
+	// XXX: Return CMD_FAILURE when servers SQUIT themselves (i.e. :00S SQUIT 00S :Shutting down)
+	// to avoid RouteCommand() being called. RouteCommand() requires a valid command source but we
+	// do not have one because the server user is deleted when its TreeServer is destructed.
+	// We generate a SQUIT in TreeSocket::Squit(), with our sid as the source and send it to the
+	// remaining servers.
+	return ((quitting == server) ? CMD_FAILURE : CMD_SUCCESS);
 }
 
 /** This function is called when we receive data from a remote
@@ -241,7 +251,18 @@ void TreeSocket::OnDataReady()
 			SendError("Read null character from socket");
 			break;
 		}
-		ProcessLine(line);
+
+		try
+		{
+			ProcessLine(line);
+		}
+		catch (CoreException& ex)
+		{
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Error while processing: " + line);
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, ex.GetReason());
+			SendError(ex.GetReason() + " - check the log file for details");
+		}
+
 		if (!getError().empty())
 			break;
 	}