X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=c506a2fb78b8f8b04298720488bb7ba65f490891;hb=3f971b447fae258a92f2cc6645497cce93f1c04e;hp=2d0cd43fda57728242e5f6daa6452197c79aa2d1;hpb=d0e13160c5d561622dfc222585ad5e73b9b0fcf6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp index 2d0cd43fd..c506a2fb7 100644 --- a/src/modules/m_messageflood.cpp +++ b/src/modules/m_messageflood.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -12,9 +12,6 @@ */ #include "inspircd.h" -#include "users.h" -#include "channels.h" -#include "modules.h" /* $ModDesc: Provides channel mode +f (message flood protection) */ @@ -27,7 +24,7 @@ class floodsettings : public classbase int secs; int lines; time_t reset; - std::map counters; + std::map counters; floodsettings() : ban(0), secs(0), lines(0) {}; floodsettings(bool a, int b, int c) : ban(a), secs(b), lines(c) @@ -35,9 +32,9 @@ class floodsettings : public classbase reset = time(NULL) + secs; }; - void addmessage(userrec* who) + void addmessage(User* who) { - std::map::iterator iter = counters.find(who); + std::map::iterator iter = counters.find(who); if (iter != counters.end()) { iter->second++; @@ -53,9 +50,9 @@ class floodsettings : public classbase } } - bool shouldkick(userrec* who) + bool shouldkick(User* who) { - std::map::iterator iter = counters.find(who); + std::map::iterator iter = counters.find(who); if (iter != counters.end()) { return (iter->second >= this->lines); @@ -63,9 +60,9 @@ class floodsettings : public classbase else return false; } - void clear(userrec* who) + void clear(User* who) { - std::map::iterator iter = counters.find(who); + std::map::iterator iter = counters.find(who); if (iter != counters.end()) { counters.erase(iter); @@ -80,7 +77,7 @@ class MsgFlood : public ModeHandler public: MsgFlood(InspIRCd* Instance) : ModeHandler(Instance, 'f', 1, 0, false, MODETYPE_CHANNEL, false) { } - ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { floodsettings* x; if (channel->GetExt("flood",x)) @@ -89,13 +86,13 @@ class MsgFlood : public ModeHandler return std::make_pair(false, parameter); } - bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel) + 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(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) { floodsettings *f; @@ -134,7 +131,7 @@ class MsgFlood : public ModeHandler int nsecs = atoi(secs); if ((nlines<1) || (nsecs<1)) { - source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name); + source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick,channel->name); parameter.clear(); return MODEACTION_DENY; } @@ -143,8 +140,8 @@ class MsgFlood : public ModeHandler if (!channel->GetExt("flood", f)) { parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs); - floodsettings *f = new floodsettings(ban,nsecs,nlines); - channel->Extend("flood",f); + floodsettings *fs = new floodsettings(ban,nsecs,nlines); + channel->Extend("flood",fs); channel->SetMode('f', true); channel->SetModeParam('f', parameter.c_str(), true); return MODEACTION_ALLOW; @@ -163,9 +160,9 @@ class MsgFlood : public ModeHandler if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban)) { delete f; - floodsettings *f = new floodsettings(ban,nsecs,nlines); + floodsettings *fs = new floodsettings(ban,nsecs,nlines); channel->Shrink("flood"); - channel->Extend("flood",f); + channel->Extend("flood",fs); channel->SetModeParam('f', cur_param.c_str(), false); channel->SetModeParam('f', parameter.c_str(), true); return MODEACTION_ALLOW; @@ -180,7 +177,7 @@ class MsgFlood : public ModeHandler } else { - source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name); + source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick,channel->name); parameter.clear(); return MODEACTION_DENY; } @@ -189,7 +186,7 @@ class MsgFlood : public ModeHandler { if (channel->GetExt("flood", f)) { - DELETE(f); + delete f; channel->Shrink("flood"); channel->SetMode('f', false); return MODEACTION_ALLOW; @@ -212,15 +209,17 @@ class ModuleMsgFlood : public Module { mf = new MsgFlood(ServerInstance); - if (!ServerInstance->AddMode(mf, 'f')) + 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); } - void ProcessMessages(userrec* user,chanrec* dest, const std::string &text) + int ProcessMessages(User* user,Channel* dest, const std::string &text) { if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP) { - return; + return 0; } floodsettings *f; @@ -238,67 +237,58 @@ class ModuleMsgFlood : public Module parameters[1] = "+b"; parameters[2] = user->MakeWildHost(); ServerInstance->SendMode(parameters,3,user); - std::deque 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); + + 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)) + { delete dest; + return 1; + } } } + + return 0; } - virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) + virtual int OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list) { if (target_type == TYPE_CHANNEL) - { - ProcessMessages(user,(chanrec*)dest,text); - } + return ProcessMessages(user,(Channel*)dest,text); + + return 0; } - virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) + virtual int OnUserPreNotice(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list) { if (target_type == TYPE_CHANNEL) - { - ProcessMessages(user,(chanrec*)dest,text); - } + return ProcessMessages(user,(Channel*)dest,text); + + return 0; } - void OnChannelDelete(chanrec* chan) + void OnChannelDelete(Channel* chan) { floodsettings* f; if (chan->GetExt("flood", f)) { - DELETE(f); + delete f; chan->Shrink("flood"); } } - void Implements(char* List) - { - List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1; - } virtual ~ModuleMsgFlood() { ServerInstance->Modes->DelMode(mf); - DELETE(mf); + delete mf; } virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } };