modelist[0] = params[0].c_str();
modelist[1] = to_keep.c_str();
- if (params_to_keep.size() > 1)
+ if (params_to_keep.size() > 0)
{
for (q = 0; (q < params_to_keep.size()) && (q < 64); q++)
{
if (smode)
{
Instance->Log(DEBUG,"Send mode");
- this->Instance->SendMode(modelist, n+2, who);
+ this->Instance->SendMode(modelist, n, who);
}
else
{
Instance->Log(DEBUG,"Send mode client");
- this->Instance->CallCommandHandler("MODE", modelist, n+2, who);
+ this->Instance->CallCommandHandler("MODE", modelist, n, who);
}
/* HOT POTATO! PASS IT ON! */
chanrec* chan = this->Instance->FindChan(channel);
if (chan)
- {
key = chan->key;
- }
+
strlcpy(mode_users[0],channel.c_str(),MAXBUF);
/* default is a high value, which if we dont have this
* channel will let the other side apply their modes.
*/
time_t ourTS = time(NULL)+600;
- chanrec* us = this->Instance->FindChan(channel);
- if (us)
- {
- ourTS = us->age;
- }
+
+ if (chan)
+ ourTS = chan->age;
/* XXX: PAY ATTENTION:
* In 1.1, if they have the newer channel, we immediately clear
* Note that this causes the losing server to send out confirming
* FMODE lines.
*/
- if ((ourTS > TS) || (this->Instance->ULine(source.c_str())))
+ if (ourTS > TS)
+// || (this->Instance->ULine(source.c_str())))
{
Instance->Log(DEBUG,"FJOIN detected, our TS=%lu, their TS=%lu",ourTS,TS);
std::deque<std::string> param_list;
- us->age = TS;
+ if (chan)
+ chan->age = TS;
ourTS = TS;
- param_list.push_back(chan->name);
+ param_list.push_back(channel);
Instance->Log(DEBUG,"REMOVE ALL STATUS MODES FROM OUR USERS *NOW*");
this->RemoveStatus(Instance->Config->ServerName, param_list);
}
{
char* permissions = usr;
int ntimes = 0;
- while ((*permissions) && (*permissions != ','))
+ char* nm = new char[MAXBUF];
+ char* tnm = nm;
+
+ while ((*permissions) && (*permissions != ',') && (ntimes < MAXBUF))
{
ModeHandler* mh = Instance->Modes->FindPrefix(*permissions);
if (mh)
{
ntimes++;
- charlcat(modestring,mh->GetModeChar(),MAXBUF);
+ *tnm++ = mh->GetModeChar();
}
else
{
usr++;
permissions++;
}
- usr++;
- /* Did they get any modes? How many times? */
- for (int k = 0; k < ntimes; k++)
- mode_users[modectr++] = strdup(usr);
+ *tnm = 0;
+ usr++;
who = this->Instance->FindNick(usr);
if (who)
{
+ /* Did they get any modes? How many times? */
+ strlcat(modestring, nm, MAXBUF);
+ for (int k = 0; k < ntimes; k++)
+ mode_users[modectr++] = strdup(usr);
+
+ delete[] nm;
+
+ TreeServer* route_back_again = BestRouteTo(who->server);
+ if ((!route_back_again) || (route_back_again->GetSocket() != this))
+ {
+ Instance->Log(DEBUG,"Fake direction in FJOIN, user '%s'",who->nick);
+ continue;
+ }
chanrec::JoinUser(this->Instance, who, channel.c_str(), true, key);
if (modectr >= (MAXMODES-1))
{
/* theres a mode for this user. push them onto the mode queue, and flush it
* if there are more than MAXMODES to go.
*/
- if ((ourTS >= TS) || (this->Instance->ULine(who->server)))
+ if (ourTS >= TS)
{
/* We also always let u-lined clients win, no matter what the TS value */
Instance->Log(DEBUG,"Our our channel newer than theirs, accepting their modes");
this->Instance->SendMode((const char**)mode_users,modectr,who);
if (ourTS != TS)
{
- Instance->Log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us->name,ourTS,TS);
- us->age = TS;
+ Instance->Log(DEFAULT,"Channel TS for %s changed from %lu to %lu",chan->name,ourTS,TS);
+ chan->age = TS;
ourTS = TS;
}
}
}
else
{
+ delete[] nm;
Instance->Log(SPARSE,"Warning! Invalid user in FJOIN to channel %s IGNORED", channel.c_str());
continue;
}
/* there werent enough modes built up to flush it during FJOIN,
* or, there are a number left over. flush them out.
*/
- if ((modectr > 2) && (who) && (us))
+ if ((modectr > 2) && (who) && (chan))
{
if (ourTS >= TS)
{
this->Instance->SendMode((const char**)mode_users,modectr,who);
if (ourTS != TS)
{
- Instance->Log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us->name,ourTS,TS);
- us->age = TS;
+ Instance->Log(DEFAULT,"Channel TS for %s changed from %lu to %lu",chan->name,ourTS,TS);
+ chan->age = TS;
ourTS = TS;
}
}
this->Instance->SNO->WriteToSnoMask('l',"Remote rehash initiated from server \002"+prefix+"\002.");
this->Instance->RehashServer();
ReadConfiguration(false);
+ InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance);
}
DoOneToAllButSender(prefix,"REHASH",params,prefix);
return true;
if (c)
{
+ irc::modestacker modestack(false);
CUList *ulist = c->GetUsers();
+ const char* y[127];
+ std::deque<std::string> stackresult;
+ std::string x;
+
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
std::string modesequence = Instance->Modes->ModeString(i->second, c);
if (modesequence.length())
{
- modesequence = "-" + modesequence;
-
- std::deque<std::string> items;
- const char* y[127];
- unsigned int z = 0;
- std::string x = "*";
+ ServerInstance->Log(DEBUG,"Mode sequence = '%s'",modesequence.c_str());
irc::spacesepstream sep(modesequence);
+ std::string modeletters = sep.GetToken();
+ ServerInstance->Log(DEBUG,"Mode letters = '%s'",modeletters.c_str());
- while ((x = sep.GetToken()) != "")
+ while (!modeletters.empty())
{
- if (!z)
- {
- y[z++] = c->name;
- items.push_back(c->name);
- items.push_back(ConvToStr(c->age));
- }
- items.push_back(x);
- y[z++] = (items.end() - 1)->c_str();
+ char mletter = *(modeletters.begin());
+ modestack.Push(mletter,sep.GetToken());
+ ServerInstance->Log(DEBUG,"Push letter = '%c'",mletter);
+ modeletters.erase(modeletters.begin());
+ ServerInstance->Log(DEBUG,"Mode letters = '%s'",modeletters.c_str());
}
+ }
+ }
- DoOneToMany(Instance->Config->ServerName, "FMODE", items);
- userrec* n = new userrec(Instance);
- n->SetFd(FD_MAGIC_NUMBER);
- Instance->SendMode(y,z,n);
- delete n;
+ while (modestack.GetStackedLine(stackresult))
+ {
+ ServerInstance->Log(DEBUG,"Stacked line size %d",stackresult.size());
+ stackresult.push_front(ConvToStr(c->age));
+ stackresult.push_front(c->name);
+ DoOneToMany(Instance->Config->ServerName, "FMODE", stackresult);
+ stackresult.erase(stackresult.begin() + 1);
+ ServerInstance->Log(DEBUG,"Stacked items:");
+ for (size_t z = 0; z < stackresult.size(); z++)
+ {
+ y[z] = stackresult[z].c_str();
+ ServerInstance->Log(DEBUG,"\tstackresult[%d]='%s'",z,stackresult[z].c_str());
}
+ userrec* n = new userrec(Instance);
+ n->SetFd(FD_MAGIC_NUMBER);
+ Instance->SendMode(y, stackresult.size(), n);
+ delete n;
}
}
return true;
virtual Version GetVersion()
{
- return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+ return Version(1,1,0,2,VF_STATIC|VF_VENDOR,API_VERSION);
}
void Implements(char* List)