* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
*/
#include "inspircd.h"
-#include "xline.h"
-
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
-
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
-
+#include "commands.h"
+#include "treeserver.h"
+#include "treesocket.h"
/** FJOIN, almost identical to TS6 SJOIN, except for nicklist handling. */
-bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> ¶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 */
irc::tokenstream users((params.size() > 3) ? params[params.size() - 1] : ""); /* users from the user list */
bool apply_other_sides_modes = true; /* True if we are accepting the other side's modes */
- Channel* chan = this->ServerInstance->FindChan(channel); /* The channel we're sending joins to */
- time_t ourTS = chan ? chan->age : ServerInstance->Time()+600; /* The TS of our side of the link */
+ Channel* chan = ServerInstance->FindChan(channel); /* The channel we're sending joins to */
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, ourTS);
-
- /* If our TS is less than theirs, we dont accept their modes */
- if (ourTS < TS)
- apply_other_sides_modes = false;
-
- /* Our TS greater than theirs, clear all our modes from the channel, accept theirs. */
- if (ourTS > TS)
{
- std::deque<std::string> 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 (!created)
+ chan = new Channel(channel, TS);
+ ServerInstance->SNO->WriteToSnoMask('d', "Creation FJOIN recieved for %s, timestamp: %lu", chan->name.c_str(), (unsigned long)TS);
+ }
+ else
+ {
+ time_t ourTS = chan->age;
+
+ if (TS != ourTS)
+ ServerInstance->SNO->WriteToSnoMask('d', "Merge FJOIN recieved for %s, ourTS: %lu, TS: %lu, difference: %lu",
+ chan->name.c_str(), (unsigned long)ourTS, (unsigned long)TS, (unsigned long)(ourTS - TS));
+ /* If our TS is less than theirs, we dont accept their modes */
+ if (ourTS < TS)
+ {
+ ServerInstance->SNO->WriteToSnoMask('d', "NOT Applying modes from other side");
+ apply_other_sides_modes = false;
+ }
+ else if (ourTS > TS)
{
+ /* 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->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);
+ ourTS = 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.
}
/* First up, apply their modes if they won the TS war */
modelist.push_back(params[idx]);
}
- this->ServerInstance->SendMode(modelist, this->ServerInstance->FakeClient);
+ ServerInstance->SendMode(modelist, srcuser);
}
/* Now, process every 'modes,nick' pair */
if (mh)
modes += *unparsedmodes;
else
- {
- this->SendError(std::string("Unknown status mode '")+(*unparsedmodes)+"' in FJOIN");
- return false;
- }
+ return CMD_INVALID;
usr++;
unparsedmodes++;
usr++;
/* Check the user actually exists */
- who = this->ServerInstance->FindUUID(usr);
+ who = ServerInstance->FindUUID(usr);
if (who)
{
/* 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(this->ServerInstance, who, channel.c_str(), true, "", true, TS);
+ Channel::JoinUser(who, channel.c_str(), true, "", route_back_again->bursting, TS);
}
else
{
/* Flush mode stacker if we lost the FJOIN or had equal TS */
if (apply_other_sides_modes)
{
- std::deque<std::string> stackresult;
- std::vector<std::string> mode_junk;
- mode_junk.push_back(channel);
+ parameterlist stackresult;
+ stackresult.push_back(channel);
while (modestack.GetStackedLine(stackresult))
{
- for (size_t j = 0; j < stackresult.size(); j++)
- {
- mode_junk.push_back(stackresult[j]);
- }
- ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
+ ServerInstance->SendMode(stackresult, srcuser);
+ stackresult.erase(stackresult.begin() + 1, stackresult.end());
}
}
-
- return true;
+ return CMD_SUCCESS;
}
-/** TODO: This creates a total mess of output and needs to really use irc::modestacker.
- */
-bool TreeSocket::RemoveStatus(const std::string &prefix, std::deque<std::string> ¶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);
- std::deque<std::string> stackresult;
- std::vector<std::string> mode_junk;
- mode_junk.push_back(c->name);
+ irc::modestacker stack(false);
+ parameterlist stackresult;
+ stackresult.push_back(c->name);
for (char modeletter = 'A'; modeletter <= 'z'; ++modeletter)
{
while (stack.GetStackedLine(stackresult))
{
- for (size_t j = 0; j < stackresult.size(); j++)
- mode_junk.push_back(stackresult[j]);
-
- ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
+ ServerInstance->SendMode(stackresult, srcuser);
+ stackresult.erase(stackresult.begin() + 1, stackresult.end());
}
}
- return true;
}
projects / user / henk / code / inspircd.git / blobdiff