X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ffjoin.cpp;h=0a8c8ca94267c2dc9efe8e8a45a345a71be540c5;hb=f963831dff32311d4a350feceefae5377f0765db;hp=dfe2fe13cf8c3c23ea6e2ee050e0f789e549e5d4;hpb=056682a6e1746306117a7f3e820e8c4ea37f722a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp index dfe2fe13c..0a8c8ca94 100644 --- a/src/modules/m_spanningtree/fjoin.cpp +++ b/src/modules/m_spanningtree/fjoin.cpp @@ -49,42 +49,35 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque &p * The winning side on the other hand will ignore all user modes from the * losing side, so only its own modes get applied. Life is simple for those * who succeed at internets. :-) - * - * NOTE: Unlike TS6 and dreamforge and other protocols which have SJOIN, - * FJOIN does not contain the simple-modes such as +iklmnsp. Why not, - * you ask? Well, quite simply because we don't need to. They'll be sent - * after the FJOIN by FMODE, and FMODE is timestamped, so in the event - * the losing side sends any modes for the channel which shouldnt win, - * they wont as their timestamp will be too high :-) */ if (params.size() < 3) return true; - irc::modestacker modestack(true); /* Modes to apply from the users in the user list */ + irc::modestacker modestack(ServerInstance, 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->Instance->FindChan(channel); /* The channel we're sending joins to */ - time_t ourTS = chan ? chan->age : Instance->Time()+600; /* The TS of our side of the link */ + 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 */ 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); if (!TS) { - Instance->Logs->Log("m_spanningtree",DEFAULT,"*** BUG? *** TS of 0 sent to FJOIN. Are some services authors smoking craq, or is it 1970 again?. Dropped."); - Instance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FJOIN with a TS of zero. Total craq. Command was dropped.", source.c_str()); + 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; } if (created) - chan = new Channel(Instance, channel, ourTS); + chan = new Channel(ServerInstance, channel, ourTS); /* If our TS is less than theirs, we dont accept their modes */ if (ourTS < TS) @@ -95,13 +88,13 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque &p { std::deque param_list; if (Utils->AnnounceTSChange && chan) - chan->WriteChannelWithServ(Instance->Config->ServerName, "NOTICE %s :TS for %s changed from %lu to %lu", chan->name, chan->name, (unsigned long) ourTS, (unsigned long) TS); + 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->age = TS; param_list.push_back(channel); - this->RemoveStatus(Instance->Config->GetSID(), param_list); + this->RemoveStatus(ServerInstance->Config->GetSID(), param_list); } } @@ -109,20 +102,18 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque &p if (apply_other_sides_modes) { unsigned int idx = 2; - int numpara = 1; - const char* modelist[64]; - memset(&modelist,0,sizeof(modelist)); + std::vector modelist; // Mode parser needs to know what channel to act on. - modelist[0] = params[0].c_str(); + modelist.push_back(params[0]); /* Remember, params[params.size() - 1] is nicklist, and we don't want to apply *that* */ for (idx = 2; idx != (params.size() - 1); idx++) { - modelist[numpara++] = params[idx].c_str(); + modelist.push_back(params[idx]); } - this->Instance->SendMode(modelist, numpara, this->Instance->FakeClient); + this->ServerInstance->SendMode(modelist, this->ServerInstance->FakeClient); } /* Now, process every 'modes,nick' pair */ @@ -138,12 +129,12 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque &p /* Iterate through all modes for this user and check they are valid. */ while ((*unparsedmodes) && (*unparsedmodes != ',')) { - ModeHandler *mh = Instance->Modes->FindMode(*unparsedmodes, MODETYPE_CHANNEL); + ModeHandler *mh = ServerInstance->Modes->FindMode(*unparsedmodes, MODETYPE_CHANNEL); if (mh) modes += *unparsedmodes; else { - this->SendError(std::string("Invalid prefix '")+(*unparsedmodes)+"' in FJOIN"); + this->SendError(std::string("Unknown status mode '")+(*unparsedmodes)+"' in FJOIN"); return false; } @@ -153,9 +144,9 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque &p /* Advance past the comma, to the nick */ usr++; - + /* Check the user actually exists */ - who = this->Instance->FindUUID(usr); + who = this->ServerInstance->FindUUID(usr); if (who) { /* Check that the user's 'direction' is correct */ @@ -167,11 +158,11 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque &p for (std::string::iterator x = modes.begin(); x != modes.end(); ++x) modestack.Push(*x, who->nick); - Channel::JoinUser(this->Instance, who, channel.c_str(), true, "", true, TS); + Channel::JoinUser(this->ServerInstance, who, channel.c_str(), true, "", true, TS); } else { - Instance->Logs->Log("m_spanningtree",SPARSE,"Warning! Invalid user %s in FJOIN to channel %s IGNORED", usr, channel.c_str()); + ServerInstance->Logs->Log("m_spanningtree",SPARSE, "Ignored nonexistant user %s in fjoin to %s (probably quit?)", usr, channel.c_str()); continue; } } @@ -181,41 +172,39 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque &p if (apply_other_sides_modes) { std::deque stackresult; - const char* mode_junk[MAXMODES+2]; - mode_junk[0] = channel.c_str(); + std::vector mode_junk; + mode_junk.push_back(channel); while (modestack.GetStackedLine(stackresult)) { for (size_t j = 0; j < stackresult.size(); j++) { - mode_junk[j+1] = stackresult[j].c_str(); + mode_junk.push_back(stackresult[j]); } - Instance->SendMode(mode_junk, stackresult.size() + 1, Instance->FakeClient); + ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient); } } return true; } -/** TODO: This creates a total mess of output and needs to really use irc::modestacker. - */ bool TreeSocket::RemoveStatus(const std::string &prefix, std::deque ¶ms) { if (params.size() < 1) return true; - Channel* c = Instance->FindChan(params[0]); + Channel* c = ServerInstance->FindChan(params[0]); if (c) { - irc::modestacker stack(false); + irc::modestacker stack(ServerInstance, false); std::deque stackresult; - const char* mode_junk[MAXMODES+2]; - mode_junk[0] = c->name; + std::vector mode_junk; + mode_junk.push_back(c->name); for (char modeletter = 'A'; modeletter <= 'z'; ++modeletter) { - ModeHandler* mh = Instance->Modes->FindMode(modeletter, MODETYPE_CHANNEL); + ModeHandler* mh = ServerInstance->Modes->FindMode(modeletter, MODETYPE_CHANNEL); /* Passing a pointer to a modestacker here causes the mode to be put onto the mode stack, * rather than applied immediately. Module unloads require this to be done immediately, @@ -228,11 +217,11 @@ bool TreeSocket::RemoveStatus(const std::string &prefix, std::deque while (stack.GetStackedLine(stackresult)) { for (size_t j = 0; j < stackresult.size(); j++) - mode_junk[j+1] = stackresult[j].c_str(); + mode_junk.push_back(stackresult[j]); - Instance->SendMode(mode_junk, stackresult.size() + 1, Instance->FakeClient); + ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient); } } return true; } - +