X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fpostcommand.cpp;h=b36cfec20721ea27625237caf2b861ae3e84e54f;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=c10bccaf9bcaeda151230b03423fb5e55e207c0c;hpb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index c10bccaf9..b36cfec20 100644
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -23,22 +23,15 @@
 #include "utils.h"
 #include "treeserver.h"
 
-/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h */
-
-void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::vector<std::string>& parameters, LocalUser *user, CmdResult result, const std::string &original_line)
+void ModuleSpanningTree::OnPostCommand(Command* command, const std::vector<std::string>& parameters, LocalUser* user, CmdResult result, const std::string& original_line)
 {
 	if (result == CMD_SUCCESS)
 		Utils->RouteCommand(NULL, command, parameters, user);
 }
 
-void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &command, const parameterlist& parameters, User *user)
+void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscmd, const parameterlist& parameters, User* user)
 {
-	if (!ServerInstance->Parser->IsValidCommand(command, parameters.size(), user))
-		return;
-
-	/* We know it's non-null because IsValidCommand returned true */
-	Command* thiscmd = ServerInstance->Parser->GetHandler(command);
-
+	const std::string& command = thiscmd->name;
 	RouteDescriptor routing = thiscmd->GetRouting(user, parameters);
 
 	std::string sent_cmd = command;
@@ -46,15 +39,7 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &
 
 	if (routing.type == ROUTE_TYPE_LOCALONLY)
 	{
-		/* Broadcast when it's a core command with the default route descriptor and the source is a
-		 * remote user or a remote server
-		 */
-
-		Version ver = thiscmd->creator->GetVersion();
-		if ((!(ver.Flags & VF_CORE)) || (IS_LOCAL(user)) || (IS_SERVER(user) == ServerInstance->FakeClient))
-			return;
-
-		routing = ROUTE_BROADCAST;
+		return;
 	}
 	else if (routing.type == ROUTE_TYPE_OPT_BCAST)
 	{
@@ -67,7 +52,7 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &
 		TreeServer* sdest = FindServer(routing.serverdest);
 		if (!sdest)
 		{
-			ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Trying to route ENCAP to nonexistant server %s",
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Trying to route ENCAP to nonexistant server %s",
 				routing.serverdest.c_str());
 			return;
 		}
@@ -82,14 +67,13 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &
 
 		if (!(ver.Flags & (VF_COMMON | VF_CORE)) && srcmodule != Creator)
 		{
-			ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Routed command %s from non-VF_COMMON module %s",
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Routed command %s from non-VF_COMMON module %s",
 				command.c_str(), srcmodule->ModuleSourceFile.c_str());
 			return;
 		}
 	}
 
-	std::string output_text;
-	ServerInstance->Parser->TranslateUIDs(thiscmd->translation, parameters, output_text, true, thiscmd);
+	std::string output_text = CommandParser::TranslateUIDs(thiscmd->translation, parameters, true, thiscmd);
 
 	params.push_back(output_text);
 
@@ -107,27 +91,13 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &
 			Channel* c = ServerInstance->FindChan(dest);
 			if (!c)
 				return;
-			TreeServerList list;
 			// TODO OnBuildExemptList hook was here
-			GetListOfServersForChannel(c,list,pfx, CUList());
-			std::string data = ":" + user->uuid + " " + sent_cmd;
-			for (unsigned int x = 0; x < params.size(); x++)
-				data += " " + params[x];
-			for (TreeServerList::iterator i = list.begin(); i != list.end(); i++)
-			{
-				TreeSocket* Sock = (*i)->GetSocket();
-				if (origin && origin->GetSocket() == Sock)
-					continue;
-				if (Sock)
-					Sock->WriteLine(data);
-			}
+			CUList exempts;
+			SendChannelMessage(user->uuid, c, parameters[1], pfx, exempts, sent_cmd.c_str(), origin ? origin->GetSocket() : NULL);
 		}
 		else if (dest[0] == '$')
 		{
-			if (origin)
-				DoOneToAllButSender(user->uuid, sent_cmd, params, origin->GetName());
-			else
-				DoOneToMany(user->uuid, sent_cmd, params);
+			DoOneToAllButSender(user->uuid, sent_cmd, params, origin);
 		}
 		else
 		{
@@ -144,10 +114,7 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &
 	}
 	else if (routing.type == ROUTE_TYPE_BROADCAST || routing.type == ROUTE_TYPE_OPT_BCAST)
 	{
-		if (origin)
-			DoOneToAllButSender(user->uuid, sent_cmd, params, origin->GetName());
-		else
-			DoOneToMany(user->uuid, sent_cmd, params);
+		DoOneToAllButSender(user->uuid, sent_cmd, params, origin);
 	}
 	else if (routing.type == ROUTE_TYPE_UNICAST || routing.type == ROUTE_TYPE_OPT_UCAST)
 	{