X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fpostcommand.cpp;h=84ca342ecb2879fe67ee73c940630e829306f3d2;hb=dbf4d595433ecefeb61f1267ffa515a91c3ab548;hp=44476c8c771d4611dd8c49dfb9f659213de9fc13;hpb=f087d825a88760d251b8f80b5d50bc98b40fa2ae;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp index 44476c8c7..84ca342ec 100644 --- a/src/modules/m_spanningtree/postcommand.cpp +++ b/src/modules/m_spanningtree/postcommand.cpp @@ -2,79 +2,156 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ /* $ModDesc: Provides a spanning tree server link protocol */ - + #include "inspircd.h" -#include "commands/cmd_whois.h" -#include "commands/cmd_stats.h" #include "socket.h" -#include "wildcard.h" -#include "xline.h" -#include "transport.h" - -#include "m_spanningtree/timesynctimer.h" -#include "m_spanningtree/resolvers.h" -#include "m_spanningtree/main.h" -#include "m_spanningtree/utils.h" -#include "m_spanningtree/treeserver.h" -#include "m_spanningtree/link.h" -#include "m_spanningtree/treesocket.h" -#include "m_spanningtree/rconnect.h" -#include "m_spanningtree/rsquit.h" +#include "xline.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 */ -/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h m_spanningtree/rsquit.h */ +void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::vector& parameters, User *user, CmdResult result, const std::string &original_line) +{ + if (result == CMD_SUCCESS) + Utils->RouteCommand(NULL, command, parameters, user); +} -void ModuleSpanningTree::OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line) +void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &command, const parameterlist& parameters, User *user) { - if ((result == CMD_SUCCESS) && (ServerInstance->IsValidModuleCommand(command, pcnt, user))) - { - /* Safe, we know its non-null because IsValidModuleCommand returned true */ - command_t* thiscmd = ServerInstance->Parser->GetHandler(command); - // this bit of code cleverly routes all module commands - // to all remote severs *automatically* so that modules - // can just handle commands locally, without having - // to have any special provision in place for remote - // commands and linking protocols. - std::deque params; - params.clear(); - int n_translate = thiscmd->translation.size(); - TranslateType translate_to; + if (!ServerInstance->IsValidModuleCommand(command, parameters.size(), user)) + return; - /* To make sure that parameters with spaces, or empty - * parameters, etc, are always sent properly, *always* - * prefix the last parameter with a :. This also removes - * an extra strchr() */ - for (int j = 0; j < pcnt; j++) - { - std::string target; + /* We know it's non-null because IsValidModuleCommand returned true */ + Command* thiscmd = ServerInstance->Parser->GetHandler(command); - /* Map all items to UUIDs where neccessary */ - if (j < n_translate) - { - /* We have a translation mapping for this index */ - translate_to = thiscmd->translation[j] != TR_END ? thiscmd->translation[j] : TR_TEXT; - } - else - translate_to = TR_TEXT; + RouteDescriptor routing = thiscmd->GetRouting(user, parameters); - ServerInstance->Log(DEBUG,"TRANSLATION: %s - type is %d", parameters[j], translate_to); - ServerInstance->Parser->TranslateUIDs(translate_to, parameters[j], target); - - if (j == (pcnt - 1)) - params.push_back(":" + target); - else - params.push_back(target); - } - Utils->DoOneToMany(user->uuid, command, params); - } -} + std::string sent_cmd = command; + parameterlist params; + if (routing.type == ROUTE_TYPE_LOCALONLY) + { + Module* srcmodule = thiscmd->creator; + Version ver = srcmodule->GetVersion(); + + if ((ver.Flags & VF_CORE) && !IS_LOCAL(user)) + routing = ROUTE_BROADCAST; + else + return; + if (user == ServerUser) + 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) + { + TreeServer* sdest = FindServer(routing.serverdest); + if (!sdest) + { + ServerInstance->Logs->Log("m_spanningtree",ERROR,"Trying to route ENCAP to nonexistant server %s", + routing.serverdest.c_str()); + return; + } + params.push_back(sdest->GetID()); + params.push_back(command); + sent_cmd = "ENCAP"; + } + else + { + Module* srcmodule = thiscmd->creator; + Version ver = srcmodule->GetVersion(); + + if (!(ver.Flags & (VF_COMMON | VF_CORE))) + { + ServerInstance->Logs->Log("m_spanningtree",ERROR,"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); + + params.push_back(output_text); + + if (routing.type == ROUTE_TYPE_MESSAGE) + { + char pfx = 0; + std::string dest = routing.serverdest; + if (ServerInstance->Modes->FindPrefix(dest[0])) + { + pfx = dest[0]; + dest = dest.substr(1); + } + if (dest[0] == '#') + { + 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->second->GetSocket(); + if (origin && origin->GetSocket() == Sock) + continue; + if (Sock) + Sock->WriteLine(data); + } + } + else if (dest[0] == '$') + { + if (origin) + DoOneToAllButSender(user->uuid, sent_cmd, params, origin->GetName()); + else + DoOneToMany(user->uuid, sent_cmd, params); + } + else + { + // user target? + User* d = ServerInstance->FindNick(dest); + if (!d) + return; + TreeServer* tsd = BestRouteTo(d->server); + if (tsd == origin) + // huh? no routing stuff around in a circle, please. + return; + DoOneToOne(user->uuid, sent_cmd, params, d->server); + } + } + 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); + } + else if (routing.type == ROUTE_TYPE_UNICAST || routing.type == ROUTE_TYPE_OPT_UCAST) + { + if (origin && routing.serverdest == origin->GetName()) + return; + DoOneToOne(user->uuid, sent_cmd, params, routing.serverdest); + } +}