X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fpostcommand.cpp;h=c10bccaf9bcaeda151230b03423fb5e55e207c0c;hb=e9e75e50bc25e67af22dd88b39b12217a553d5cb;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..c10bccaf9 100644 --- a/src/modules/m_spanningtree/postcommand.cpp +++ b/src/modules/m_spanningtree/postcommand.cpp @@ -1,38 +1,42 @@ -/* +------------------------------------+ - * | 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 */ +/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h */ -void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::vector& parameters, User *user, CmdResult result, const std::string &original_line) +void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::vector& parameters, LocalUser *user, CmdResult result, const std::string &original_line) { - if (result != CMD_SUCCESS) - return; - if (!ServerInstance->IsValidModuleCommand(command, parameters.size(), user)) + if (result == CMD_SUCCESS) + Utils->RouteCommand(NULL, command, parameters, user); +} + +void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &command, const parameterlist& parameters, User *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); @@ -42,7 +46,15 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::ve if (routing.type == ROUTE_TYPE_LOCALONLY) { - return; + /* 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; } else if (routing.type == ROUTE_TYPE_OPT_BCAST) { @@ -52,10 +64,10 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::ve } else if (routing.type == ROUTE_TYPE_OPT_UCAST) { - TreeServer* sdest = Utils->FindServer(routing.serverdest); + TreeServer* sdest = FindServer(routing.serverdest); if (!sdest) { - ServerInstance->Logs->Log("m_spanningtree",ERROR,"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; } @@ -68,13 +80,9 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::ve 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("m_spanningtree",LOG_DEFAULT,"Routed command %s from non-VF_COMMON module %s", command.c_str(), srcmodule->ModuleSourceFile.c_str()); return; } @@ -85,8 +93,66 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::ve params.push_back(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 = 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)->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); + } }