]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_joinflood.cpp
Remove InspIRCd* parameters and fields
[user/henk/code/inspircd.git] / src / modules / m_joinflood.cpp
index e739e3d92f276c6da7c8dda64bc941bd2f83da8f..2520cbfcf880c6e8aa391c6d25fb2e1b6bc17b98 100644 (file)
@@ -2,33 +2,24 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <map>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +j (join flood protection) */
 
+/** Holds settings and state associated with channel mode +j
+ */
 class joinfloodsettings : public classbase
 {
  public:
-
        int secs;
        int joins;
        time_t reset;
@@ -36,24 +27,20 @@ class joinfloodsettings : public classbase
        int counter;
        bool locked;
 
-       joinfloodsettings() : secs(0), joins(0) {};
        joinfloodsettings(int b, int c) : secs(b), joins(c)
        {
-               reset = time(NULL) + secs;
+               reset = ServerInstance->Time() + secs;
                counter = 0;
                locked = false;
-               log(DEBUG,"Create new joinfloodsettings: %lu %lu",time(NULL),reset);
        };
 
        void addjoin()
        {
                counter++;
-               log(DEBUG,"joinflood counter is %d",counter);
-               if (time(NULL) > reset)
+               if (ServerInstance->Time() > reset)
                {
-                       log(DEBUG,"joinflood counter reset");
                        counter = 0;
-                       reset = time(NULL) + secs;
+                       reset = ServerInstance->Time() + secs;
                }
        }
 
@@ -64,7 +51,6 @@ class joinfloodsettings : public classbase
 
        void clear()
        {
-               log(DEBUG,"joinflood counter clear");
                counter = 0;
        }
 
@@ -72,7 +58,7 @@ class joinfloodsettings : public classbase
        {
                if (locked)
                {
-                       if (time(NULL) > unlocktime)
+                       if (ServerInstance->Time() > unlocktime)
                        {
                                locked = false;
                                return false;
@@ -87,37 +73,32 @@ class joinfloodsettings : public classbase
 
        void lock()
        {
-               log(DEBUG,"joinflood lock");
                locked = true;
-               unlocktime = time(NULL) + 60;
+               unlocktime = ServerInstance->Time() + 60;
        }
 
 };
 
+/** Handles channel mode +j
+ */
 class JoinFlood : public ModeHandler
 {
  public:
-       JoinFlood() : ModeHandler('j', 1, 0, false, MODETYPE_CHANNEL, false) { }
-
-        ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
-        {
-                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);
-        } 
+       SimpleExtItem<joinfloodsettings> ext;
+       JoinFlood(Module* Creator) : ModeHandler(Creator, 'j', PARAM_SETONLY, MODETYPE_CHANNEL),
+               ext("joinflood", Creator) { }
 
-        bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+       ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
        {
-               /* When TS is equal, the alphabetically later one wins */
-               return (their_param < our_param);
+               joinfloodsettings* x = ext.get(channel);
+               if (x)
+                       return std::make_pair(true, ConvToStr(x->joins)+":"+ConvToStr(x->secs));
+               else
+                       return std::make_pair(false, parameter);
        }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
-               joinfloodsettings* dummy;
-
                if (adding)
                {
                        char ndata[MAXBUF];
@@ -137,44 +118,68 @@ class JoinFlood : public ModeHandler
                                else data++;
                        }
                        if (secs)
+
                        {
                                /* Set up the flood parameters for this channel */
                                int njoins = atoi(joins);
                                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
                                {
-                                       if (!channel->GetExt("joinflood", dummy))
+                                       joinfloodsettings* f = ext.get(channel);
+                                       if (!f)
                                        {
                                                parameter = ConvToStr(njoins) + ":" +ConvToStr(nsecs);
-                                               joinfloodsettings *f = new joinfloodsettings(nsecs,njoins);
-                                               channel->Extend("joinflood", f);
-                                               channel->SetMode('j', true);
-                                               channel->SetModeParam('j', parameter.c_str(), true);
+                                               f = new joinfloodsettings(nsecs, njoins);
+                                               ext.set(channel, f);
+                                               channel->SetModeParam('j', parameter);
                                                return MODEACTION_ALLOW;
                                        }
+                                       else
+                                       {
+                                               std::string cur_param = channel->GetModeParameter('j');
+                                               parameter = ConvToStr(njoins) + ":" +ConvToStr(nsecs);
+                                               if (cur_param == parameter)
+                                               {
+                                                       // mode params match
+                                                       return MODEACTION_DENY;
+                                               }
+                                               else
+                                               {
+                                                       // new mode param, replace old with new
+                                                       if ((nsecs > 0) && (njoins > 0))
+                                                       {
+                                                               f = new joinfloodsettings(nsecs, njoins);
+                                                               ext.set(channel, f);
+                                                               channel->SetModeParam('j', parameter);
+                                                               return MODEACTION_ALLOW;
+                                                       }
+                                                       else
+                                                       {
+                                                               return MODEACTION_DENY;
+                                                       }
+                                               }
+                                       }
                                }
                        }
                        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;
                        }
                }
                else
                {
-                       if (channel->GetExt("joinflood", dummy))
+                       joinfloodsettings* f = ext.get(channel);
+                       if (f)
                        {
-                               joinfloodsettings *f;
-                               channel->GetExt("joinflood", f);
-                               DELETE(f);
-                               channel->Shrink("joinflood");
-                               channel->SetMode('j', false);
+                               ext.unset(channel);
+                               channel->SetModeParam('j', "");
                                return MODEACTION_ALLOW;
                        }
                }
@@ -184,104 +189,66 @@ class JoinFlood : public ModeHandler
 
 class ModuleJoinFlood : public Module
 {
-       Server *Srv;
-       JoinFlood* jf;
-       
+
+       JoinFlood jf;
+
  public:
-       ModuleJoinFlood(Server* Me)
-               : Module::Module(Me)
+
+       ModuleJoinFlood()
+               : jf(this)
        {
-               Srv = Me;
-               jf = new JoinFlood();
-               Srv->AddMode(jf, 'j');
+
+               if (!ServerInstance->Modes->AddMode(&jf))
+                       throw ModuleException("Could not add new modes!");
+               Extensible::Register(&jf.ext);
+               Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreJoin, I_OnUserJoin };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
-       
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+
+       ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                if (chan)
                {
-                       joinfloodsettings *f;
-                       if (chan->GetExt("joinflood", f))
+                       joinfloodsettings *f = jf.ext.get(chan);
+                       if (f && f->islocked())
                        {
-                               if (f->islocked())
-                               {
-                                       user->WriteServ("609 %s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick,chan->name);
-                                       return 1;
-                               }
+                               user->WriteNumeric(609, "%s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick.c_str(),chan->name.c_str());
+                               return MOD_RES_DENY;
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual void OnUserJoin(userrec* user, chanrec* channel)
+       void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts)
        {
-               joinfloodsettings *f;
-               if (channel->GetExt("joinflood",f))
+               /* We arent interested in JOIN events caused by a network burst */
+               if (sync)
+                       return;
+
+               joinfloodsettings *f = jf.ext.get(memb->chan);
+
+               /* But all others are OK */
+               if (f)
                {
                        f->addjoin();
                        if (f->shouldlock())
                        {
                                f->clear();
                                f->lock();
-                               channel->WriteChannelWithServ((char*)Srv->GetServerName().c_str(), "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);
+                               memb->chan->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.", memb->chan->name.c_str(), f->joins, f->secs);
                        }
                }
        }
 
-       void OnChannelDelete(chanrec* chan)
+       ~ModuleJoinFlood()
        {
-               joinfloodsettings *f;
-               if (chan->GetExt("joinflood",f))
-               {
-                       DELETE(f);
-                       chan->Shrink("joinflood");
-               }
+               ServerInstance->Modes->DelMode(&jf);
        }
 
-       void Implements(char* List)
+       Version GetVersion()
        {
-               List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserJoin] = 1;
+               return Version("Provides channel mode +j (join flood protection)", VF_COMMON | VF_VENDOR, API_VERSION);
        }
-
-       virtual void On005Numeric(std::string &output)
-       {
-               InsertMode(output, "j", 3);
-       }
-
-       virtual ~ModuleJoinFlood()
-       {
-               DELETE(jf);
-       }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
-       }
-};
-
-
-class ModuleJoinFloodFactory : public ModuleFactory
-{
- public:
-       ModuleJoinFloodFactory()
-       {
-       }
-       
-       ~ModuleJoinFloodFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleJoinFlood(Me);
-       }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleJoinFloodFactory;
-}
-
+MODULE_INIT(ModuleJoinFlood)