Move destruction logic for User and Spanningtree into cull()

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

diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index 4d5011575691aeadc630fe099539a7753134f4a0..d13dc1e0a1f64922a5fce73c3e1a5ce9216771df 100644 (file)
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -25,8 +25,7 @@ class ModuleConnectBan : public Module
        unsigned int ipv4_cidr;
        unsigned int ipv6_cidr;
  public:
-       ModuleConnectBan(InspIRCd* Me) : Module(Me)
-       {
+       ModuleConnectBan()      {
                Implementation eventlist[] = { I_OnUserConnect, I_OnGarbageCollect, I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, 3);
                OnRehash(NULL);
@@ -38,12 +37,12 @@ class ModuleConnectBan : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR,API_VERSION);
+               return Version("Throttles the connections of any users who try connect flood", VF_VENDOR,API_VERSION);
        }
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader Conf(ServerInstance);
+               ConfigReader Conf;
                std::string duration;
 
                ipv4_cidr = Conf.ReadInteger("connectban", "ipv4cidr", 0, true);
@@ -91,7 +90,7 @@ class ModuleConnectBan : public Module
                        if (i->second >= threshold)
                        {
                                // Create zline for set duration.
-                               ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), banduration, ServerInstance->Config->ServerName, "Connect flooding", u->GetCIDRMask(range));
+                               ZLine* zl = new ZLine(ServerInstance->Time(), banduration, ServerInstance->Config->ServerName, "Connect flooding", u->GetCIDRMask(range));
                                if (ServerInstance->XLines->AddLine(zl,NULL))
                                        ServerInstance->XLines->ApplyLines();
                                else