bool shouldlock()
{
- return (counter >= this->nicks);
+ /* XXX HACK: using counter + 1 here now to allow the counter to only be incremented
+ * on successful nick changes; this will be checked before the counter is
+ * incremented.
+ */
+ return (counter + 1 >= this->nicks);
}
void clear()
parameter = ConvToStr(nnicks) + ":" +ConvToStr(nsecs);
nickfloodsettings *f = new nickfloodsettings(ServerInstance, nsecs, nnicks);
channel->Extend("nickflood", f);
- channel->SetMode('F', true);
- channel->SetModeParam('F', parameter.c_str(), true);
+ channel->SetModeParam('F', parameter);
return MODEACTION_ALLOW;
}
else
f = new nickfloodsettings(ServerInstance, nsecs, nnicks);
channel->Shrink("nickflood");
channel->Extend("nickflood", f);
- channel->SetModeParam('F', cur_param.c_str(), false);
- channel->SetModeParam('F', parameter.c_str(), true);
+ channel->SetModeParam('F', parameter);
return MODEACTION_ALLOW;
}
else
channel->GetExt("nickflood", f);
delete f;
channel->Shrink("nickflood");
- channel->SetMode('F', false);
+ channel->SetModeParam('F', "");
return MODEACTION_ALLOW;
}
}
class ModuleNickFlood : public Module
{
- NickFlood* jf;
+ NickFlood jf;
public:
ModuleNickFlood(InspIRCd* Me)
- : Module(Me)
+ : Module(Me), jf(Me)
{
-
- jf = new NickFlood(ServerInstance);
- if (!ServerInstance->Modes->AddMode(jf))
+ if (!ServerInstance->Modes->AddMode(&jf))
throw ModuleException("Could not add new modes!");
- Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreNick };
- ServerInstance->Modules->Attach(eventlist, this, 2);
+ Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreNick, I_OnUserPostNick };
+ ServerInstance->Modules->Attach(eventlist, this, 3);
}
virtual int OnUserPreNick(User* user, const std::string &newnick)
return 1;
}
- f->addnick();
if (f->shouldlock())
{
f->clear();
return 0;
}
+ /*
+ * XXX: HACK: We do the increment on the *POST* event here (instead of all together) because we have no way of knowing whether other modules would block a nickchange.
+ */
+ virtual void OnUserPostNick(User* user, const std::string &oldnick)
+ {
+ if (isdigit(user->nick[0])) /* allow switches to UID */
+ return;
+
+ for (UCListIter i = user->chans.begin(); i != user->chans.end(); ++i)
+ {
+ Channel *channel = i->first;
+
+ nickfloodsettings *f;
+ if (channel->GetExt("nickflood", f))
+ {
+ if (CHANOPS_EXEMPT(ServerInstance, 'F') && channel->GetStatus(user) == STATUS_OP)
+ return;
+
+ /* moved this here to avoid incrementing the counter for nick
+ * changes that are denied for some other reason (bans, +N, etc.)
+ * per bug #874.
+ */
+ f->addnick();
+ }
+ }
+ return;
+ }
+
void OnChannelDelete(Channel* chan)
{
nickfloodsettings *f;
virtual ~ModuleNickFlood()
{
- ServerInstance->Modes->DelMode(jf);
- delete jf;
+ ServerInstance->Modes->DelMode(&jf);
}
virtual Version GetVersion()