and a little tweak to remote MOTD too.

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

diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index 519088324868a5aaf1bea41f82f465f4005dc5cf..eb9c9af924a8c1619286d21dd905d698028cf417 100644 (file)
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -11,11 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "modules.h"
 
-#include "inspircd.h"
-
 /* $ModDesc: Connection throttle */
 
 int conns = 0, throttled = 0;
@@ -31,7 +30,7 @@ private:
        
 
 public:
-       ModuleConnFlood(InspIRCd* Me) : Module::Module(Me)
+       ModuleConnFlood(InspIRCd* Me) : Module(Me)
        {
                
                InitConf();
@@ -70,9 +69,10 @@ public:
        virtual int OnUserRegister(userrec* user)
        {
                time_t next = ServerInstance->Time();
-               if (!first)
-                       first = next - boot_wait;
-
+               
+               if ((ServerInstance->startup_time + boot_wait) > next)
+                       return 0;
+               
                /* time difference between first and latest connection */
                time_t tdiff = next - first;
 
@@ -110,7 +110,7 @@ public:
                return 0;
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                InitConf();
        }
@@ -128,7 +128,7 @@ public:
        ~ModuleConnFloodFactory()
        {
        }
-    
+
        virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleConnFlood(Me);
@@ -136,7 +136,7 @@ public:
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleConnFloodFactory;
 }