Add config <options:disablehmac> to support disabling of HMAC, and tidy up to detect...

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

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 5a4f03340ea10838dfb290534e1f0ddb8158eae6..012c95a8e8cfe89972c6c58df9e9beb0c419558b 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -2,32 +2,26 @@
  *       | 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-2007 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 <stdio.h>
 #include <map>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +f (message flood protection) */
 
-
-
+/** Holds flood settings and state for mode +f
+ */
 class floodsettings : public classbase
 {
  public:
@@ -81,6 +75,8 @@ class floodsettings : public classbase
        }
 };
 
+/** Handles channel mode +f
+ */
 class MsgFlood : public ModeHandler
 {
  public:
@@ -148,13 +144,26 @@ class MsgFlood : public ModeHandler
                                {
                                        if (!channel->GetExt("flood", f))
                                        {
-                                               parameter = ConvToStr(nlines) + ":" +ConvToStr(nsecs);
+                                               parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
                                                floodsettings *f = new floodsettings(ban,nsecs,nlines);
                                                channel->Extend("flood",f);
                                                channel->SetMode('f', true);
                                                channel->SetModeParam('f', parameter.c_str(), true);
                                                return MODEACTION_ALLOW;
                                        }
+                                       else
+                                       {
+                                               if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban))
+                                               {
+                                                       delete f;
+                                                       floodsettings *f = new floodsettings(ban,nsecs,nlines);
+                                                       parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
+                                                       channel->Shrink("flood");
+                                                       channel->Extend("flood",f);
+                                                       channel->SetModeParam('f', parameter.c_str(), true);
+                                                       return MODEACTION_ALLOW;
+                                               }
+                                       }
                                }
                        }
                        else
@@ -191,7 +200,8 @@ class ModuleMsgFlood : public Module
        {
                
                mf = new MsgFlood(ServerInstance);
-               ServerInstance->AddMode(mf, 'f');
+               if (!ServerInstance->AddMode(mf, 'f'))
+                       throw ModuleException("Could not add new modes!");
        }
        
        void ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
@@ -226,13 +236,15 @@ class ModuleMsgFlood : public Module
                                                Event rmode((char *)&n, NULL, "send_mode");
                                                rmode.Send(ServerInstance);
                                        }
-                                       dest->ServerKickUser(user, "Channel flood triggered (mode +f)", true);
+                                       char kickmessage[MAXBUF];
+                                       snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs);
+                                       dest->ServerKickUser(user, kickmessage, true);
                                }
                        }
                }
        }
 
-       virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status)
+       virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -240,7 +252,7 @@ class ModuleMsgFlood : public Module
                }
        }
 
-       virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status)
+       virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -260,22 +272,18 @@ class ModuleMsgFlood : public Module
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1;
-       }
-
-       virtual void On005Numeric(std::string &output)
-       {
-               ServerInstance->Modes->InsertMode(output, "f", 3);
+               List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1;
        }
 
        virtual ~ModuleMsgFlood()
        {
+               ServerInstance->Modes->DelMode(mf);
                DELETE(mf);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };