Change httpd modules to use the MODNAME constant in headers.

[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 e6bfdda1fab6e2d1ba1556a0d510d7ed2a6a56ac..ca32aa64f26a178bde8da8d57c774d4cd5e1644b 100644 (file)
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -20,8 +20,6 @@
 #include "inspircd.h"
 #include "xline.h"
 
-/* $ModDesc: Throttles the connections of IP ranges who try to connect flood. */
-
 class ModuleConnectBan : public Module
 {
        clonemap connects;
@@ -31,19 +29,19 @@ class ModuleConnectBan : public Module
        unsigned int ipv6_cidr;
 
  public:
-       void init()
+       void init() CXX11_OVERRIDE
        {
                Implementation eventlist[] = { I_OnSetUserIP, I_OnGarbageCollect, I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
                OnRehash(NULL);
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Throttles the connections of IP ranges who try to connect flood.", VF_VENDOR);
        }
 
-       virtual void OnRehash(User* user)
+       void OnRehash(User* user) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("connectban");
 
@@ -64,7 +62,7 @@ class ModuleConnectBan : public Module
                        banduration = 10*60;
        }
 
-       virtual void OnSetUserIP(LocalUser* u)
+       void OnSetUserIP(LocalUser* u) CXX11_OVERRIDE
        {
                if (u->exempt)
                        return;
@@ -93,11 +91,12 @@ class ModuleConnectBan : public Module
                        {
                                // Create zline for set duration.
                                ZLine* zl = new ZLine(ServerInstance->Time(), banduration, ServerInstance->Config->ServerName, "Your IP range has been attempting to connect too many times in too short a duration. Wait a while, and you will be able to connect.", mask.str());
-                               if (ServerInstance->XLines->AddLine(zl,NULL))
-                                       ServerInstance->XLines->ApplyLines();
-                               else
+                               if (!ServerInstance->XLines->AddLine(zl, NULL))
+                               {
                                        delete zl;
-
+                                       return;
+                               }
+                               ServerInstance->XLines->ApplyLines();
                                std::string maskstr = mask.str();
                                std::string timestr = ServerInstance->TimeString(zl->expiry);
                                ServerInstance->SNO->WriteGlobalSno('x',"Module m_connectban added Z:line on *@%s to expire on %s: Connect flooding",
@@ -112,9 +111,9 @@ class ModuleConnectBan : public Module
                }
        }
 
-       virtual void OnGarbageCollect()
+       void OnGarbageCollect()
        {
-               ServerInstance->Logs->Log("m_connectban",LOG_DEBUG, "Clearing map.");
+               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Clearing map.");
                connects.clear();
        }
 };