X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=466ceb52e27f88088cbed0a8dd612c0c8b7d1e95;hb=83137d5f9274832f152acc7d19de3cb0897f9630;hp=14e963f782e37495a891df992f8e4784520cf407;hpb=b7d4d9501e8fa7ed97d69bf89e4410d6b4908be9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp index 14e963f78..466ceb52e 100644 --- a/src/modules/m_joinflood.cpp +++ b/src/modules/m_joinflood.cpp @@ -2,26 +2,15 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - -#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) */ @@ -38,12 +27,13 @@ class joinfloodsettings : public classbase time_t unlocktime; int counter; bool locked; + InspIRCd* ServerInstance; joinfloodsettings() : secs(0), joins(0) {}; joinfloodsettings(int b, int c) : secs(b), joins(c) { - reset = InspIRCd::Time() + secs; + reset = time(NULL) + secs; counter = 0; locked = false; }; @@ -51,10 +41,10 @@ class joinfloodsettings : public classbase void addjoin() { counter++; - if (InspIRCd::Time() > reset) + if (time(NULL) > reset) { counter = 0; - reset = InspIRCd::Time() + secs; + reset = time(NULL) + secs; } } @@ -72,7 +62,7 @@ class joinfloodsettings : public classbase { if (locked) { - if (InspIRCd::Time() > unlocktime) + if (time(NULL) > unlocktime) { locked = false; return false; @@ -88,7 +78,7 @@ class joinfloodsettings : public classbase void lock() { locked = true; - unlocktime = InspIRCd::Time() + 60; + unlocktime = time(NULL) + 60; } }; @@ -100,28 +90,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); @@ -139,6 +128,7 @@ class JoinFlood : public ModeHandler else data++; } if (secs) + { /* Set up the flood parameters for this channel */ int njoins = atoi(joins); @@ -146,7 +136,7 @@ class JoinFlood : public ModeHandler if ((njoins<1) || (nsecs<1)) { source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name); - parameter = ""; + parameter.clear(); return MODEACTION_DENY; } else @@ -204,7 +194,7 @@ class JoinFlood : public ModeHandler { joinfloodsettings *f; channel->GetExt("joinflood", f); - DELETE(f); + delete f; channel->Shrink("joinflood"); channel->SetMode('j', false); return MODEACTION_ALLOW; @@ -222,14 +212,17 @@ class ModuleJoinFlood : public Module 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) { if (chan) { @@ -246,9 +239,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(); @@ -261,55 +260,27 @@ class ModuleJoinFlood : public Module } } - 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); + delete jf; } virtual Version GetVersion() { - return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); - } -}; - - -class ModuleJoinFloodFactory : public ModuleFactory -{ - public: - ModuleJoinFloodFactory() - { + return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } - - ~ModuleJoinFloodFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleJoinFlood(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleJoinFloodFactory; -} - +MODULE_INIT(ModuleJoinFlood)