X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket1.cpp;h=931bd3f9f4fcacb32cbba9667ed17e0fd6e1108d;hb=393cc8f9d65aefd92628115edae341562ea440e7;hp=9e0acdd12305e0a080a2244ca32b56058390bf77;hpb=5cc9614e73a783dec7a8e0887a0435cf577eaad4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 9e0acdd12..931bd3f9f 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -44,16 +44,7 @@ TreeSocket::TreeSocket(Link* link, Autoconnect* myac, const std::string& ipaddr)
 	capab->link = link;
 	capab->ac = myac;
 	capab->capab_phase = 0;
-	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(static_cast<IOHook*>(prov));
-	}
+
 	DoConnect(ipaddr, link->Port, link->Timeout, link->Bind);
 	Utils->timeoutlist[this] = std::pair<std::string, int>(linkID, link->Timeout);
 	SendCapabilities(1);
@@ -71,9 +62,8 @@ TreeSocket::TreeSocket(int newfd, ListenSocket* via, irc::sockets::sockaddrs* cl
 	capab = new CapabData;
 	capab->capab_phase = 0;
 
-	FOREACH_MOD(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);
@@ -116,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);
@@ -150,9 +151,10 @@ void TreeSocket::SquitServer(std::string &from, TreeServer* Current, int& num_lo
 	 * 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 */
@@ -178,27 +180,33 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
 			LocalSquit = true;
 			if (Current->GetSocket()->Introduced())
 			{
-				parameterlist params;
+				CmdBuilder params("SQUIT");
 				params.push_back(Current->GetID());
-				params.push_back(":"+reason);
-				Utils->DoOneToMany(Utils->TreeRoot->GetID(), "SQUIT", params);
+				params.push_last(reason);
+				params.Broadcast();
 			}
 		}
 		else
 		{
-			ServerInstance->SNO->WriteGlobalSno('L', "Server \002"+Current->GetName()+"\002 split from server \002"+Current->GetParent()->GetName()+"\002 with reason: "+reason);
+			ServerInstance->SNO->WriteToSnoMask('L', "Server \002"+Current->GetName()+"\002 split from server \002"+Current->GetParent()->GetName()+"\002 with reason: "+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();
 		Current->GetParent()->DelChild(Current);
 		Current->cull();
+		const bool ismyroot = (Current == MyRoot);
 		delete Current;
-		if (Current == MyRoot)
+		if (ismyroot)
 		{
 			MyRoot = NULL;
 			Close();
@@ -206,7 +214,7 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
 	}
 }
 
-CmdResult CommandSQuit::Handle(User* user, std::vector<std::string>& params)
+CmdResult CommandSQuit::HandleServer(TreeServer* server, std::vector<std::string>& params)
 {
 	TreeServer* quitting = Utils->FindServer(params[0]);
 	if (!quitting)
@@ -215,9 +223,15 @@ CmdResult CommandSQuit::Handle(User* user, std::vector<std::string>& params)
 		return CMD_FAILURE;
 	}
 
-	TreeSocket* sock = Utils->FindServer(user->server)->GetSocket();
+	TreeSocket* sock = server->GetSocket();
 	sock->Squit(quitting, params[1]);
-	return CMD_SUCCESS;
+
+	// 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
@@ -237,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;
 	}