void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &command, const parameterlist& parameters, User *user)
{
- if (!ServerInstance->IsValidModuleCommand(command, parameters.size(), user))
+ if (!ServerInstance->Parser->IsValidCommand(command, parameters.size(), user))
return;
- /* We know it's non-null because IsValidModuleCommand returned true */
+ /* We know it's non-null because IsValidCommand returned true */
Command* thiscmd = ServerInstance->Parser->GetHandler(command);
RouteDescriptor routing = thiscmd->GetRouting(user, parameters);
if (routing.type == ROUTE_TYPE_LOCALONLY)
{
- Module* srcmodule = thiscmd->creator;
- Version ver = srcmodule->GetVersion();
+ /* Broadcast when it's a core command with the default route descriptor and the source is a
+ * remote user or a remote server
+ */
- if ((ver.Flags & VF_CORE) && !IS_LOCAL(user))
- routing = ROUTE_BROADCAST;
- else
- return;
- if (IS_SERVER(user) && user != ServerInstance->FakeClient)
+ Version ver = thiscmd->creator->GetVersion();
+ if ((!(ver.Flags & VF_CORE)) || (IS_LOCAL(user)) || (IS_SERVER(user) == ServerInstance->FakeClient))
return;
+
+ routing = ROUTE_BROADCAST;
}
else if (routing.type == ROUTE_TYPE_OPT_BCAST)
{
TreeServer* sdest = FindServer(routing.serverdest);
if (!sdest)
{
- ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Trying to route ENCAP to nonexistant server %s",
+ ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Trying to route ENCAP to nonexistant server %s",
routing.serverdest.c_str());
return;
}
if (!(ver.Flags & (VF_COMMON | VF_CORE)) && srcmodule != Creator)
{
- ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Routed command %s from non-VF_COMMON module %s",
+ ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Routed command %s from non-VF_COMMON module %s",
command.c_str(), srcmodule->ModuleSourceFile.c_str());
return;
}