Allow commands to optionally route themselves using ENCAP

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11602 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 36 insertions, 13 deletions

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index c56f8dc74..7b85a49d0 100644
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -22,15 +22,20 @@
 
 
 
-/** remote MOTD. leet, huh? */
+/** ENCAP */
 bool TreeSocket::Encap(const std::string &prefix, parameterlist &params)
 {
 	if (params.size() > 1)
 	{
 		if (InspIRCd::Match(ServerInstance->Config->GetSID(), params[0]))
 		{
-			Event event((char*) &params, (Module*)this->Utils->Creator, "encap_received");
-			event.Send(ServerInstance);
+			User* who = this->ServerInstance->FindUUID(prefix);
+			if (!who)
+				who = Utils->ServerUser;
+
+			parameterlist plist(params.begin() + 2, params.end());
+			ServerInstance->CallCommandHandler(params[1].c_str(), plist, who);
+			// discard return value, ENCAP shall succeed even if the command does not exist
 		}
 		
 		params[params.size() - 1] = ":" + params[params.size() - 1];
diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index 428079c23..545ad3bfb 100644
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -39,25 +39,43 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::ve
 
 	RouteDescriptor routing = thiscmd->GetRouting(user, parameters);
 
+	std::string sent_cmd = command;
+	parameterlist params;
+
 	if (routing.type == ROUTE_TYPE_LOCALONLY)
+	{
 		return;
+	}
+	else if (routing.type == ROUTE_TYPE_OPT_BCAST)
+	{
+		params.push_back("*");
+		params.push_back(command);
+		sent_cmd = "ENCAP";
+	}
+	else if (routing.type == ROUTE_TYPE_OPT_UCAST)
+	{
+		params.push_back(routing.serverdest);
+		params.push_back(command);
+		sent_cmd = "ENCAP";
+	}
+	else
+	{
+		Module* srcmodule = ServerInstance->Modules->Find(thiscmd->source);
 
-	Module* srcmodule = ServerInstance->Modules->Find(thiscmd->source);
-
-	if (srcmodule && !(srcmodule->GetVersion().Flags & VF_COMMON)) {
-		ServerInstance->Logs->Log("m_spanningtree",ERROR,"Routed command %s from non-VF_COMMON module %s",
-			command.c_str(), thiscmd->source.c_str());
-		return;
+		if (srcmodule && !(srcmodule->GetVersion().Flags & VF_COMMON)) {
+			ServerInstance->Logs->Log("m_spanningtree",ERROR,"Routed command %s from non-VF_COMMON module %s",
+				command.c_str(), thiscmd->source.c_str());
+			return;
+		}
 	}
 
 	std::string output_text;
 	ServerInstance->Parser->TranslateUIDs(thiscmd->translation, parameters, output_text, true, thiscmd);
 
-	parameterlist params;
 	params.push_back(output_text);
 
-	if (routing.type == ROUTE_TYPE_BROADCAST)
-		Utils->DoOneToMany(user->uuid, command, params);
+	if (routing.type == ROUTE_TYPE_BROADCAST || routing.type == ROUTE_TYPE_OPT_BCAST)
+		Utils->DoOneToMany(user->uuid, sent_cmd, params);
 	else
-		Utils->DoOneToOne(user->uuid, command, params, routing.serverdest);
+		Utils->DoOneToOne(user->uuid, sent_cmd, params, routing.serverdest);
 }