m_spanningtree Move all server-to-server command handlers into handler classes

These commands are not registered in or called by the core. When looking for the handler of a command a new command table is searched first which contains all server-to-server commands. If a handler cannot be found in there, the core command table is consulted.

1 files changed, 10 insertions, 28 deletions

diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp
index 2ef76a351..2ee8401fa 100644
--- a/src/modules/m_spanningtree/addline.cpp
+++ b/src/modules/m_spanningtree/addline.cpp
@@ -20,36 +20,19 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "treesocket.h"
 #include "treeserver.h"
 #include "utils.h"
+#include "commands.h"
 
-bool TreeSocket::AddLine(const std::string &prefix, parameterlist &params)
+CmdResult CommandAddLine::Handle(User* usr, std::vector<std::string>& params)
 {
-	if (params.size() < 6)
-	{
-		const std::string& servername = MyRoot->GetName();
-		ServerInstance->SNO->WriteToSnoMask('d', "%s sent me a malformed ADDLINE", servername.c_str());
-		return true;
-	}
-
 	XLineFactory* xlf = ServerInstance->XLines->GetFactory(params[0]);
-
-	std::string setter = "<unknown>";
-	User* usr = ServerInstance->FindNick(prefix);
-	if (usr)
-		setter = usr->nick;
-	else
-	{
-		TreeServer* t = Utils->FindServer(prefix);
-		if (t)
-			setter = t->GetName();
-	}
+	const std::string& setter = usr->nick;
 
 	if (!xlf)
 	{
 		ServerInstance->SNO->WriteToSnoMask('d',"%s sent me an unknown ADDLINE type (%s).",setter.c_str(),params[0].c_str());
-		return true;
+		return CMD_FAILURE;
 	}
 
 	XLine* xl = NULL;
@@ -60,7 +43,7 @@ bool TreeSocket::AddLine(const std::string &prefix, parameterlist &params)
 	catch (ModuleException &e)
 	{
 		ServerInstance->SNO->WriteToSnoMask('d',"Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason());
-		return true;
+		return CMD_FAILURE;
 	}
 	xl->SetCreateTime(ConvToInt(params[3]));
 	if (ServerInstance->XLines->AddLine(xl, NULL))
@@ -76,20 +59,19 @@ bool TreeSocket::AddLine(const std::string &prefix, parameterlist &params)
 			ServerInstance->SNO->WriteToSnoMask('X',"%s added permanent %s%s on %s: %s",setter.c_str(),params[0].c_str(),params[0].length() == 1 ? "-line" : "",
 					params[1].c_str(),params[5].c_str());
 		}
-		params[5] = ":" + params[5];
 
-		User* u = ServerInstance->FindNick(prefix);
-		Utils->DoOneToAllButSender(prefix, "ADDLINE", params, u ? u->server : prefix);
-		TreeServer *remoteserver = Utils->FindServer(u ? u->server : prefix);
+		TreeServer* remoteserver = Utils->FindServer(usr->server);
 
 		if (!remoteserver->bursting)
 		{
 			ServerInstance->XLines->ApplyLines();
 		}
+		return CMD_SUCCESS;
 	}
 	else
+	{
 		delete xl;
-
-	return true;
+		return CMD_FAILURE;
+	}
 }