X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket1.cpp;h=9e0acdd12305e0a080a2244ca32b56058390bf77;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=719c31bcea45370b9abc7888a7a9d69fcd9be07f;hpb=d763f0b2eeee0e1c9cade555ce21337a1be629df;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 719c31bce..9e0acdd12 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -29,14 +29,15 @@
 #include "treeserver.h"
 #include "link.h"
 #include "treesocket.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), linkID(assign(link->Name)), LinkState(CONNECTING), MyRoot(NULL), proto_version(0), ConnectionFailureShown(false)
+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())
 {
 	capab = new CapabData;
@@ -62,14 +63,15 @@ 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), linkID("inbound from " + client->addr()), LinkState(WAIT_AUTH_1), MyRoot(NULL), proto_version(0)
+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;
 
-	FOREACH_MOD(I_OnHookIO, OnHookIO(this, via));
+	FOREACH_MOD(OnHookIO, (this, via));
 	if (GetIOHook())
 		GetIOHook()->OnStreamSocketAccept(this, client, server);
 	SendCapabilities(1);
@@ -143,9 +145,7 @@ 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", LOG_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 ;)
@@ -168,22 +168,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->GetName());
-		}
-
-		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())
+			{
+				parameterlist params;
+				params.push_back(Current->GetID());
+				params.push_back(":"+reason);
+				Utils->DoOneToMany(Utils->TreeRoot->GetID(), "SQUIT", params);
+			}
 		}
 		else
 		{
@@ -205,8 +204,20 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
 			Close();
 		}
 	}
-	else
-		ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Squit from unknown server");
+}
+
+CmdResult CommandSQuit::Handle(User* user, 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 = Utils->FindServer(user->server)->GetSocket();
+	sock->Squit(quitting, params[1]);
+	return CMD_SUCCESS;
 }
 
 /** This function is called when we receive data from a remote