Annotations

[user/henk/code/inspircd.git] / src / modules / m_joinflood.cpp

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 33b6b8b61ab5754c859115ec4349d063ae7c03bb..8557ad11f808b016716e85c50c625fbef68b5103 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -21,10 +21,13 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "configreader.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:
@@ -37,21 +40,19 @@ class joinfloodsettings : public classbase
        bool locked;
 
        joinfloodsettings() : secs(0), joins(0) {};
+
        joinfloodsettings(int b, int c) : secs(b), joins(c)
        {
                reset = time(NULL) + 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)
                {
-                       log(DEBUG,"joinflood counter reset");
                        counter = 0;
                        reset = time(NULL) + secs;
                }
@@ -64,7 +65,6 @@ class joinfloodsettings : public classbase
 
        void clear()
        {
-               log(DEBUG,"joinflood counter clear");
                counter = 0;
        }
 
@@ -87,17 +87,33 @@ class joinfloodsettings : public classbase
 
        void lock()
        {
-               log(DEBUG,"joinflood lock");
                locked = true;
                unlocktime = time(NULL) + 60;
        }
 
 };
 
+/** Handles channel mode +j
+ */
 class JoinFlood : public ModeHandler
 {
  public:
-       JoinFlood() : ModeHandler('j', 1, 0, false, MODETYPE_CHANNEL, false) { }
+       JoinFlood(InspIRCd* Instance) : ModeHandler(Instance, '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);
+        } 
+
+        bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* 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 &parameter, bool adding)
        {
@@ -105,6 +121,7 @@ class JoinFlood : public ModeHandler
 
                if (adding)
                {
+                       ServerInstance->Log(DEBUG,"Got parameter: '%s'",parameter.c_str());
                        char ndata[MAXBUF];
                        char* data = ndata;
                        strlcpy(ndata,parameter.c_str(),MAXBUF);
@@ -128,7 +145,7 @@ class JoinFlood : public ModeHandler
                                int nsecs = atoi(secs);
                                if ((njoins<1) || (nsecs<1))
                                {
-                                       WriteServ(source->fd,"608 %s %s :Invalid flood parameter",source->nick,channel->name);
+                                       source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
                                        parameter = "";
                                        return MODEACTION_DENY;
                                }
@@ -143,11 +160,41 @@ class JoinFlood : public ModeHandler
                                                channel->SetModeParam('j', parameter.c_str(), true);
                                                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))
+                                                       {
+                                                               joinfloodsettings* f;
+                                                               channel->GetExt("joinflood", f);
+                                                               delete f;
+                                                               f = new joinfloodsettings(nsecs,njoins);
+                                                               channel->Shrink("joinflood");
+                                                               channel->Extend("joinflood", f);
+                                                               channel->SetModeParam('j', cur_param.c_str(), false);
+                                                               channel->SetModeParam('j', parameter.c_str(), true);
+                                                               return MODEACTION_ALLOW;
+                                                       }
+                                                       else
+                                                       {
+                                                               return MODEACTION_DENY;
+                                                       }
+                                               }
+                                       }
                                }
                        }
                        else
                        {
-                               WriteServ(source->fd,"608 %s %s :Invalid flood parameter",source->nick,channel->name);
+                               source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
                                return MODEACTION_DENY;
                        }
                }
@@ -169,17 +216,17 @@ class JoinFlood : public ModeHandler
 
 class ModuleJoinFlood : public Module
 {
-       Server *Srv;
+       
        JoinFlood* jf;
        
  public:
  
-       ModuleJoinFlood(Server* Me)
+       ModuleJoinFlood(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               jf = new JoinFlood();
-               Srv->AddMode(jf, 'j');
+               
+               jf = new JoinFlood(ServerInstance);
+               ServerInstance->AddMode(jf, 'j');
        }
        
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
@@ -191,7 +238,7 @@ class ModuleJoinFlood : public Module
                        {
                                if (f->islocked())
                                {
-                                       WriteServ(user->fd,"609 %s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick,chan->name);
+                                       user->WriteServ("609 %s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick,chan->name);
                                        return 1;
                                }
                        }
@@ -209,7 +256,7 @@ class ModuleJoinFlood : public Module
                        {
                                f->clear();
                                f->lock();
-                               WriteChannelWithServ((char*)Srv->GetServerName().c_str(), channel, "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, f->joins, f->secs);
                        }
                }
        }
@@ -226,22 +273,18 @@ class ModuleJoinFlood : public Module
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserJoin] = 1;
-       }
-
-       virtual void On005Numeric(std::string &output)
-       {
-               InsertMode(output, "j", 3);
+               List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserJoin] = 1;
        }
 
        virtual ~ModuleJoinFlood()
        {
+               ServerInstance->Modes->DelMode(jf);
                DELETE(jf);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
        }
 };
 
@@ -257,7 +300,7 @@ class ModuleJoinFloodFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleJoinFlood(Me);
        }