X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ffmode.cpp;h=c1e452db627bd28d0a647609536eb75d396c8248;hb=4b8f3dd68f7c3a273c1a892c0de54ea01e48db3e;hp=137cb256a2ba2490efc3a7cf5335602194c12889;hpb=f57b33efe868200133a9839a6f1513a99cf9ab58;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp index 137cb256a..c1e452db6 100644 --- a/src/modules/m_spanningtree/fmode.cpp +++ b/src/modules/m_spanningtree/fmode.cpp @@ -1,66 +1,37 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell * - * 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 . */ -#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_hash.h" -#include "socketengine.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/resolvers.h" -#include "m_spanningtree/handshaketimer.h" +#include "inspircd.h" +#include "commands.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_hash.h */ +#include "treesocket.h" +#include "treeserver.h" +#include "utils.h" /** FMODE command - server mode with timestamp checks */ -bool TreeSocket::ForceMode(const std::string &source, std::deque ¶ms) +CmdResult CommandFMode::Handle(const std::vector& params, User *who) { - /* Chances are this is a 1.0 FMODE without TS */ - if (params.size() < 3) - { - /* No modes were in the command, probably a channel with no modes set on it */ - return true; - } + std::string sourceserv = who->server; - bool smode = false; - std::string sourceserv; - /* Are we dealing with an FMODE from a user, or from a server? */ - User* who = this->Instance->FindNick(source); - if (who) - { - /* FMODE from a user, set sourceserv to the users server name */ - sourceserv = who->server; - } - else - { - /* FMODE from a server, use a fake user to receive mode feedback */ - who = this->Instance->FakeClient; - smode = true; /* Setting this flag tells us we should free the User later */ - sourceserv = source; /* Set sourceserv to the actual source string */ - } - const char* modelist[64]; + std::vector modelist; time_t TS = 0; - int n = 0; - memset(&modelist,0,sizeof(modelist)); for (unsigned int q = 0; (q < params.size()) && (q < 64); q++) { if (q == 1) @@ -74,58 +45,49 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque &p else { /* Everything else is fine to append to the modelist */ - modelist[n++] = params[q].c_str(); + modelist.push_back(params[q]); } } /* Extract the TS value of the object, either User or Channel */ - User* dst = this->Instance->FindNick(params[0]); + User* dst = ServerInstance->FindNick(params[0]); Channel* chan = NULL; time_t ourTS = 0; + if (dst) { ourTS = dst->age; } else { - chan = this->Instance->FindChan(params[0]); + chan = ServerInstance->FindChan(params[0]); if (chan) { ourTS = chan->age; } else /* Oops, channel doesnt exist! */ - return true; + return CMD_FAILURE; } if (!TS) { - Instance->Log(DEFAULT,"*** BUG? *** TS of 0 sent to FMODE. Are some services authors smoking craq, or is it 1970 again?. Dropped."); - Instance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FMODE with a TS of zero. Total craq. Mode was dropped.", sourceserv.c_str()); - return true; + ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"*** BUG? *** TS of 0 sent to FMODE. Are some services authors smoking craq, or is it 1970 again?. Dropped."); + ServerInstance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FMODE with a TS of zero. Total craq. Mode was dropped.", sourceserv.c_str()); + return CMD_INVALID; } /* TS is equal or less: Merge the mode changes into ours and pass on. */ if (TS <= ourTS) { - if ((TS < ourTS) && (!dst)) - Instance->Log(DEFAULT,"*** BUG *** Channel TS sent in FMODE to %s is %lu which is not equal to %lu!", params[0].c_str(), TS, ourTS); - - if (smode) - { - this->Instance->SendMode(modelist, n, who); - } - else - { - this->Instance->CallCommandHandler("MODE", modelist, n, who); - } - /* HOT POTATO! PASS IT ON! */ - Utils->DoOneToAllButSender(source,"FMODE",params,sourceserv); + bool merge = (TS == ourTS) && IS_SERVER(who); + ServerInstance->Modes->Process(modelist, who, merge); + return CMD_SUCCESS; } /* If the TS is greater than ours, we drop the mode and dont pass it anywhere. */ - return true; + return CMD_FAILURE; }