-/* +------------------------------------+
- * | 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-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2008 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
-#include "inspircd.h"
-#include "xline.h"
-#include "treesocket.h"
+#include "inspircd.h"
+#include "commands.h"
#include "treeserver.h"
-#include "utils.h"
-
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
-
+#include "treesocket.h"
/** FJOIN, almost identical to TS6 SJOIN, except for nicklist handling. */
-bool TreeSocket::ForceJoin(const std::string &source, parameterlist ¶ms)
+CmdResult CommandFJoin::Handle(const std::vector<std::string>& params, User *srcuser)
{
+ SpanningTreeUtilities* Utils = ((ModuleSpanningTree*)(Module*)creator)->Utils;
/* 1.1 FJOIN works as follows:
*
* Each FJOIN is sent along with a timestamp, and the side with the lowest
* who succeed at internets. :-)
*/
if (params.size() < 3)
- return true;
+ return CMD_INVALID;
- irc::modestacker modestack(ServerInstance, true); /* Modes to apply from the users in the user list */
+ irc::modestacker modestack(true); /* Modes to apply from the users in the user list */
User* who = NULL; /* User we are currently checking */
std::string channel = params[0]; /* Channel name, as a string */
time_t TS = atoi(params[1].c_str()); /* Timestamp given to us for remote side */
bool created = !chan; /* True if the channel doesnt exist here yet */
std::string item; /* One item in the list of nicks */
- if (params.size() > 3)
- params[params.size() - 1] = ":" + params[params.size() - 1];
-
- Utils->DoOneToAllButSender(source,"FJOIN",params,source);
+ TreeSocket* src_socket = Utils->FindServer(srcuser->server)->GetRoute()->GetSocket();
if (!TS)
{
ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"*** BUG? *** TS of 0 sent to FJOIN. Are some services authors smoking craq, or is it 1970 again?. Dropped.");
- ServerInstance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FJOIN with a TS of zero. Total craq. Command was dropped.", source.c_str());
- return true;
+ ServerInstance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FJOIN with a TS of zero. Total craq. Command was dropped.", srcuser->server.c_str());
+ return CMD_INVALID;
}
if (created)
{
- chan = new Channel(ServerInstance, channel, TS);
+ chan = new Channel(channel, TS);
ServerInstance->SNO->WriteToSnoMask('d', "Creation FJOIN recieved for %s, timestamp: %lu", chan->name.c_str(), (unsigned long)TS);
}
else
/* Our TS greater than theirs, clear all our modes from the channel, accept theirs. */
ServerInstance->SNO->WriteToSnoMask('d', "Removing our modes, accepting remote");
parameterlist param_list;
- if (Utils->AnnounceTSChange && chan)
- chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :TS for %s changed from %lu to %lu", chan->name.c_str(), chan->name.c_str(), (unsigned long) ourTS, (unsigned long) TS);
- ourTS = TS;
+ if (Utils->AnnounceTSChange)
+ chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :TS for %s changed from %lu to %lu", chan->name.c_str(), channel.c_str(), (unsigned long) ourTS, (unsigned long) TS);
+ // while the name is equal in case-insensitive compare, it might differ in case; use the remote version
+ chan->name = channel;
chan->age = TS;
param_list.push_back(channel);
- this->RemoveStatus(ServerInstance->Config->GetSID(), param_list);
+ this->RemoveStatus(ServerInstance->FakeClient, param_list);
}
// The silent case here is ourTS == TS, we don't need to remove modes here, just to merge them later on.
}
modelist.push_back(params[idx]);
}
- ServerInstance->SendMode(modelist, Utils->ServerUser);
+ ServerInstance->SendMode(modelist, srcuser);
}
/* Now, process every 'modes,nick' pair */
while ((*unparsedmodes) && (*unparsedmodes != ','))
{
ModeHandler *mh = ServerInstance->Modes->FindMode(*unparsedmodes, MODETYPE_CHANNEL);
- if (mh)
- modes += *unparsedmodes;
- else
+ if (!mh)
{
- this->SendError(std::string("Unknown status mode '")+(*unparsedmodes)+"' in FJOIN");
- return false;
+ ServerInstance->Logs->Log("m_spanningtree", SPARSE, "Unrecognised mode %c, dropping link", *unparsedmodes);
+ return CMD_INVALID;
}
+ modes += *unparsedmodes;
usr++;
unparsedmodes++;
}
{
/* Check that the user's 'direction' is correct */
TreeServer* route_back_again = Utils->BestRouteTo(who->server);
- if ((!route_back_again) || (route_back_again->GetSocket() != this))
+ if ((!route_back_again) || (route_back_again->GetSocket() != src_socket))
continue;
/* Add any modes this user had to the mode stack */
for (std::string::iterator x = modes.begin(); x != modes.end(); ++x)
modestack.Push(*x, who->nick);
- Channel::JoinUser(ServerInstance, who, channel.c_str(), true, "", route_back_again->bursting, TS);
+ Channel::JoinUser(who, channel.c_str(), true, "", route_back_again->bursting, TS);
}
else
{
while (modestack.GetStackedLine(stackresult))
{
- ServerInstance->SendMode(stackresult, Utils->ServerUser);
+ ServerInstance->SendMode(stackresult, srcuser);
stackresult.erase(stackresult.begin() + 1, stackresult.end());
}
}
-
- return true;
+ return CMD_SUCCESS;
}
-bool TreeSocket::RemoveStatus(const std::string &prefix, parameterlist ¶ms)
+void CommandFJoin::RemoveStatus(User* srcuser, parameterlist ¶ms)
{
if (params.size() < 1)
- return true;
+ return;
Channel* c = ServerInstance->FindChan(params[0]);
if (c)
{
- irc::modestacker stack(ServerInstance, false);
+ irc::modestacker stack(false);
parameterlist stackresult;
stackresult.push_back(c->name);
while (stack.GetStackedLine(stackresult))
{
- ServerInstance->SendMode(stackresult, Utils->ServerUser);
+ ServerInstance->SendMode(stackresult, srcuser);
stackresult.erase(stackresult.begin() + 1, stackresult.end());
}
}
- return true;
}
projects / user / henk / code / inspircd.git / blobdiff