X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fpostcommand.cpp;h=ed962653eba84f284e320190787cc5aab002c5ff;hb=a9e8e1f03ace24e9dcb50299f8e66c5fd6b42850;hp=2cf4fa3ad58860fb4de074f39a845c433a592f92;hpb=f4472dd6dcdfbb5d4a2a50ddc615644c3b2c8145;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp index 2cf4fa3ad..ed962653e 100644 --- a/src/modules/m_spanningtree/postcommand.cpp +++ b/src/modules/m_spanningtree/postcommand.cpp @@ -1,92 +1,134 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007 Craig Edwards * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -/* $ModDesc: Provides a spanning tree server link protocol */ - #include "inspircd.h" -#include "socket.h" -#include "xline.h" -#include "../transport.h" #include "main.h" #include "utils.h" #include "treeserver.h" -#include "treesocket.h" - -/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */ +#include "commandbuilder.h" -void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::vector& parameters, User *user, CmdResult result, const std::string &original_line) +void ModuleSpanningTree::OnPostCommand(Command* command, const CommandBase::Params& parameters, LocalUser* user, CmdResult result, bool loop) { - if (result != CMD_SUCCESS) - return; - if (!ServerInstance->IsValidModuleCommand(command, parameters.size(), user)) - return; - - /* We know it's non-null because IsValidModuleCommand returned true */ - Command* thiscmd = ServerInstance->Parser->GetHandler(command); + if (result == CMD_SUCCESS) + Utils->RouteCommand(NULL, command, parameters, user); +} +void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscmd, const CommandBase::Params& parameters, User* user) +{ + const std::string& command = thiscmd->name; 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) + + const bool encap = ((routing.type == ROUTE_TYPE_OPT_BCAST) || (routing.type == ROUTE_TYPE_OPT_UCAST)); + CmdBuilder params(user, encap ? "ENCAP" : command.c_str()); + params.push_tags(parameters.GetTags()); + TreeServer* sdest = NULL; + + if (routing.type == ROUTE_TYPE_OPT_BCAST) { - params.push_back("*"); - params.push_back(command); - sent_cmd = "ENCAP"; + params.push('*'); + params.push(command); } - else if (routing.type == ROUTE_TYPE_OPT_UCAST) + else if (routing.type == ROUTE_TYPE_UNICAST || routing.type == ROUTE_TYPE_OPT_UCAST) { - TreeServer* sdest = Utils->FindServer(routing.serverdest); + sdest = static_cast(routing.server); if (!sdest) { - ServerInstance->Logs->Log("m_spanningtree",ERROR,"Trying to route ENCAP to nonexistant server %s", - routing.serverdest.c_str()); - return; + // Assume the command handler already validated routing.serverdest and have only returned success if the target is something that the + // user executing the command is allowed to look up e.g. target is not an uuid if user is local. + sdest = FindRouteTarget(routing.serverdest); + if (!sdest) + { + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Trying to route %s%s to nonexistent server %s", (encap ? "ENCAP " : ""), command.c_str(), routing.serverdest.c_str()); + return; + } + } + + if (encap) + { + params.push(sdest->GetId()); + params.push(command); } - params.push_back(sdest->GetID()); - params.push_back(command); - sent_cmd = "ENCAP"; } else { Module* srcmodule = thiscmd->creator; Version ver = srcmodule->GetVersion(); - // XXX Temporary check to avoid routing cmd_* entries while they default to global routing - if (srcmodule->ModuleSourceFile[0] == 'c') - return; - - if (!(ver.Flags & VF_COMMON)) + if (!(ver.Flags & (VF_COMMON | VF_CORE)) && srcmodule != Creator) { - ServerInstance->Logs->Log("m_spanningtree",ERROR,"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); + params.push(output_text); - if (routing.type == ROUTE_TYPE_BROADCAST || routing.type == ROUTE_TYPE_OPT_BCAST) - Utils->DoOneToMany(user->uuid, sent_cmd, params); - else - Utils->DoOneToOne(user->uuid, sent_cmd, params, routing.serverdest); + if (routing.type == ROUTE_TYPE_MESSAGE) + { + char pfx = 0; + std::string dest = routing.serverdest; + if (ServerInstance->Modes->FindPrefix(dest[0])) + { + pfx = dest[0]; + dest.erase(dest.begin()); + } + if (dest[0] == '#') + { + Channel* c = ServerInstance->FindChan(dest); + if (!c) + return; + // TODO OnBuildExemptList hook was here + CUList exempts; + std::string message; + if (parameters.size() >= 2) + message.assign(parameters[1]); + SendChannelMessage(user, c, message, pfx, parameters.GetTags(), exempts, command.c_str(), origin ? origin->GetSocket() : NULL); + } + else if (dest[0] == '$') + { + params.Forward(origin); + } + else + { + // user target? + User* d = ServerInstance->FindNick(dest); + if (!d || IS_LOCAL(d)) + return; + TreeServer* tsd = TreeServer::Get(d)->GetRoute(); + if (tsd == origin) + // huh? no routing stuff around in a circle, please. + return; + params.Unicast(d); + } + } + else if (routing.type == ROUTE_TYPE_BROADCAST || routing.type == ROUTE_TYPE_OPT_BCAST) + { + params.Forward(origin); + } + else if (routing.type == ROUTE_TYPE_UNICAST || routing.type == ROUTE_TYPE_OPT_UCAST) + { + params.Unicast(sdest->ServerUser); + } }