X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=cb8c90e098a155b23cabb5314c0b541dcf0352e4;hb=8be88f3e732e7a40f2e501c5e5b78c7f1b999f2d;hp=9ed3b13077fede6ff94801ab846b133619c6f6f6;hpb=6aecd4c9ec0e09d04a6a5e59182a229b3c374b69;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp index 9ed3b1307..cb8c90e09 100644 --- a/src/modules/m_joinflood.cpp +++ b/src/modules/m_joinflood.cpp @@ -2,8 +2,8 @@ * | 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. @@ -11,12 +11,6 @@ * --------------------------------------------------- */ -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "configreader.h" #include "inspircd.h" /* $ModDesc: Provides channel mode +j (join flood protection) */ @@ -25,21 +19,19 @@ */ class joinfloodsettings : public classbase { + private: + InspIRCd* ServerInstance; public: - int secs; int joins; time_t reset; time_t unlocktime; int counter; bool locked; - InspIRCd* ServerInstance; - - joinfloodsettings() : secs(0), joins(0) {}; - joinfloodsettings(int b, int c) : secs(b), joins(c) + joinfloodsettings(InspIRCd *Instance, int b, int c) : ServerInstance(Instance), secs(b), joins(c) { - reset = time(NULL) + secs; + reset = ServerInstance->Time() + secs; counter = 0; locked = false; }; @@ -47,10 +39,10 @@ class joinfloodsettings : public classbase void addjoin() { counter++; - if (time(NULL) > reset) + if (ServerInstance->Time() > reset) { counter = 0; - reset = time(NULL) + secs; + reset = ServerInstance->Time() + secs; } } @@ -68,7 +60,7 @@ class joinfloodsettings : public classbase { if (locked) { - if (time(NULL) > unlocktime) + if (ServerInstance->Time() > unlocktime) { locked = false; return false; @@ -84,7 +76,7 @@ class joinfloodsettings : public classbase void lock() { locked = true; - unlocktime = time(NULL) + 60; + unlocktime = ServerInstance->Time() + 60; } }; @@ -96,28 +88,27 @@ class JoinFlood : public ModeHandler public: JoinFlood(InspIRCd* Instance) : ModeHandler(Instance, 'j', 1, 0, false, MODETYPE_CHANNEL, false) { } - ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) - { - joinfloodsettings* x; - if (channel->GetExt("joinflood",x)) - return std::make_pair(true, ConvToStr(x->joins)+":"+ConvToStr(x->secs)); - else - return std::make_pair(false, parameter); - } + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) + { + joinfloodsettings* x; + if (channel->GetExt("joinflood",x)) + return std::make_pair(true, ConvToStr(x->joins)+":"+ConvToStr(x->secs)); + else + 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) { joinfloodsettings* dummy; if (adding) { - ServerInstance->Log(DEBUG,"Got parameter: '%s'",parameter.c_str()); char ndata[MAXBUF]; char* data = ndata; strlcpy(ndata,parameter.c_str(),MAXBUF); @@ -142,8 +133,8 @@ class JoinFlood : public ModeHandler int nsecs = atoi(secs); if ((njoins<1) || (nsecs<1)) { - source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name); - parameter = ""; + source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str()); + parameter.clear(); return MODEACTION_DENY; } else @@ -151,10 +142,9 @@ class JoinFlood : public ModeHandler if (!channel->GetExt("joinflood", dummy)) { parameter = ConvToStr(njoins) + ":" +ConvToStr(nsecs); - joinfloodsettings *f = new joinfloodsettings(nsecs,njoins); + joinfloodsettings *f = new joinfloodsettings(ServerInstance, nsecs, njoins); channel->Extend("joinflood", f); - channel->SetMode('j', true); - channel->SetModeParam('j', parameter.c_str(), true); + channel->SetModeParam('j', parameter); return MODEACTION_ALLOW; } else @@ -174,11 +164,10 @@ class JoinFlood : public ModeHandler joinfloodsettings* f; channel->GetExt("joinflood", f); delete f; - f = new joinfloodsettings(nsecs,njoins); + f = new joinfloodsettings(ServerInstance, nsecs, njoins); channel->Shrink("joinflood"); channel->Extend("joinflood", f); - channel->SetModeParam('j', cur_param.c_str(), false); - channel->SetModeParam('j', parameter.c_str(), true); + channel->SetModeParam('j', parameter); return MODEACTION_ALLOW; } else @@ -191,7 +180,7 @@ class JoinFlood : 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.c_str(),channel->name.c_str()); return MODEACTION_DENY; } } @@ -201,9 +190,9 @@ class JoinFlood : public ModeHandler { joinfloodsettings *f; channel->GetExt("joinflood", f); - DELETE(f); + delete f; channel->Shrink("joinflood"); - channel->SetMode('j', false); + channel->SetModeParam('j', ""); return MODEACTION_ALLOW; } } @@ -213,20 +202,23 @@ class JoinFlood : public ModeHandler class ModuleJoinFlood : public Module { - + JoinFlood* jf; - + public: - + ModuleJoinFlood(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { - + jf = new JoinFlood(ServerInstance); - ServerInstance->AddMode(jf, 'j'); + if (!ServerInstance->Modes->AddMode(jf)) + throw ModuleException("Could not add new modes!"); + Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreJoin, I_OnUserJoin }; + ServerInstance->Modules->Attach(eventlist, this, 3); } - - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) + + virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) { if (chan) { @@ -235,7 +227,7 @@ class ModuleJoinFlood : public Module { if (f->islocked()) { - user->WriteServ("609 %s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick,chan->name); + user->WriteNumeric(609, "%s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick.c_str(),chan->name.c_str()); return 1; } } @@ -243,9 +235,15 @@ class ModuleJoinFlood : public Module return 0; } - virtual void OnUserJoin(userrec* user, chanrec* channel) + virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent) { joinfloodsettings *f; + + /* We arent interested in JOIN events caused by a network burst */ + if (sync) + return; + + /* But all others are OK */ if (channel->GetExt("joinflood",f)) { f->addjoin(); @@ -253,60 +251,32 @@ class ModuleJoinFlood : public Module { f->clear(); f->lock(); - channel->WriteChannelWithServ((char*)ServerInstance->Config->ServerName, "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.", channel->name, f->joins, f->secs); + channel->WriteChannelWithServ((char*)ServerInstance->Config->ServerName, "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.", channel->name.c_str(), f->joins, f->secs); } } } - void OnChannelDelete(chanrec* chan) + void OnChannelDelete(Channel* chan) { joinfloodsettings *f; if (chan->GetExt("joinflood",f)) { - DELETE(f); + delete f; chan->Shrink("joinflood"); } } - void Implements(char* List) - { - List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserJoin] = 1; - } virtual ~ModuleJoinFlood() { ServerInstance->Modes->DelMode(jf); - DELETE(jf); - } - - virtual Version GetVersion() - { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + delete jf; } -}; - -class ModuleJoinFloodFactory : public ModuleFactory -{ - public: - ModuleJoinFloodFactory() - { - } - - ~ModuleJoinFloodFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) + virtual Version GetVersion() { - return new ModuleJoinFlood(Me); + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleJoinFloodFactory; -} - +MODULE_INIT(ModuleJoinFlood)