* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
*/
class floodsettings : public classbase
{
+ private:
+ InspIRCd *ServerInstance;
public:
bool ban;
int secs;
time_t reset;
std::map<User*,int> counters;
- floodsettings() : ban(0), secs(0), lines(0) {};
- floodsettings(bool a, int b, int c) : ban(a), secs(b), lines(c)
+ floodsettings(InspIRCd *Instance, bool a, int b, int c) : ServerInstance(Instance), ban(a), secs(b), lines(c)
{
- reset = time(NULL) + secs;
+ reset = ServerInstance->Time() + secs;
};
void addmessage(User* who)
{
counters[who] = 1;
}
- if (time(NULL) > reset)
+ if (ServerInstance->Time() > reset)
{
counters.clear();
- reset = time(NULL) + secs;
+ reset = ServerInstance->Time() + secs;
}
}
return std::make_pair(false, parameter);
}
- bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
- {
- /* When TS is equal, the alphabetically later one wins */
- return (their_param < our_param);
- }
-
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool)
{
floodsettings *f;
/* Set up the flood parameters for this channel */
int nlines = atoi(lines);
int nsecs = atoi(secs);
- if ((nlines<1) || (nsecs<1))
+ if ((nlines<2) || (nsecs<1))
{
- source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
+ source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
parameter.clear();
return MODEACTION_DENY;
}
if (!channel->GetExt("flood", f))
{
parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
- floodsettings *f = new floodsettings(ban,nsecs,nlines);
- channel->Extend("flood",f);
- channel->SetMode('f', true);
- channel->SetModeParam('f', parameter.c_str(), true);
+ floodsettings *fs = new floodsettings(ServerInstance,ban,nsecs,nlines);
+ channel->Extend("flood",fs);
+ channel->SetModeParam('f', parameter);
return MODEACTION_ALLOW;
}
else
}
else
{
- if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban))
+ if ((((nlines != f->lines) || (nsecs != f->secs) || (ban != f->ban))) && (((nsecs > 0) && (nlines > 0))))
{
delete f;
- floodsettings *f = new floodsettings(ban,nsecs,nlines);
+ floodsettings *fs = new floodsettings(ServerInstance,ban,nsecs,nlines);
channel->Shrink("flood");
- channel->Extend("flood",f);
- channel->SetModeParam('f', cur_param.c_str(), false);
- channel->SetModeParam('f', parameter.c_str(), true);
+ channel->Extend("flood",fs);
+ channel->SetModeParam('f', parameter);
return MODEACTION_ALLOW;
}
else
}
else
{
- source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
+ source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
parameter.clear();
return MODEACTION_DENY;
}
{
delete f;
channel->Shrink("flood");
- channel->SetMode('f', false);
+ channel->SetModeParam('f', "");
return MODEACTION_ALLOW;
}
}
-
+
return MODEACTION_DENY;
}
};
class ModuleMsgFlood : public Module
{
-
- MsgFlood* mf;
-
+ MsgFlood mf;
+
public:
-
+
ModuleMsgFlood(InspIRCd* Me)
- : Module(Me)
+ : Module(Me), mf(Me)
{
-
- mf = new MsgFlood(ServerInstance);
- if (!ServerInstance->AddMode(mf))
+ if (!ServerInstance->Modes->AddMode(&mf))
throw ModuleException("Could not add new modes!");
Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreNotice, I_OnUserPreMessage };
ServerInstance->Modules->Attach(eventlist, this, 3);
}
-
+
int ProcessMessages(User* user,Channel* dest, const std::string &text)
{
- if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP)
+ if (!IS_LOCAL(user) || (CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP))
{
return 0;
}
f->clear(user);
if (f->ban)
{
- const char* parameters[3];
- parameters[0] = dest->name;
- parameters[1] = "+b";
- parameters[2] = user->MakeWildHost();
- ServerInstance->SendMode(parameters,3,user);
- std::deque<std::string> n;
- /* Propogate the ban to other servers.
- * We dont know what protocol we may be using,
- * so this event is picked up by our protocol
- * module and formed into a ban command that
- * suits the protocol in use.
- */
- n.push_back(dest->name);
- n.push_back("+b");
- n.push_back(user->MakeWildHost());
- Event rmode((char *)&n, NULL, "send_mode");
- rmode.Send(ServerInstance);
+ std::vector<std::string> parameters;
+ parameters.push_back(dest->name);
+ parameters.push_back("+b");
+ parameters.push_back(user->MakeWildHost());
+ ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
+
+ ServerInstance->PI->SendModeStr(dest->name, std::string("+b ") + user->MakeWildHost());
}
+
char kickmessage[MAXBUF];
snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs);
- if (!dest->ServerKickUser(user, kickmessage, true))
+
+ if (!dest->ServerKickUser(user, kickmessage))
{
delete dest;
- return 1;
}
+
+ return 1;
}
}
-
+
return 0;
}
{
if (target_type == TYPE_CHANNEL)
return ProcessMessages(user,(Channel*)dest,text);
-
+
return 0;
}
{
if (target_type == TYPE_CHANNEL)
return ProcessMessages(user,(Channel*)dest,text);
-
+
return 0;
}
virtual ~ModuleMsgFlood()
{
- ServerInstance->Modes->DelMode(mf);
- delete mf;
+ ServerInstance->Modes->DelMode(&mf);
}
-
+
virtual Version GetVersion()
{
- return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
}
};
projects / user / henk / code / inspircd.git / blobdiff