Fix mistakenly using Clang instead of GCC on older FreeBSD versions.

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

diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 946abc96871599d85947aa6ccba10bc5e2000860..4983ae16abe3afa01eaa7022feca4fe7c2a51f7c 100644 (file)
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2006-2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Allows locking of the server to stop all incoming connections till unlocked again */
@@ -23,24 +30,25 @@
 
 class CommandLockserv : public Command
 {
-private:
        bool& locked;
-
 public:
-       CommandLockserv (InspIRCd* Instance, bool &lock)
-       : Command(Instance, "LOCKSERV", "o", 0), locked(lock)
+       CommandLockserv(Module* Creator, bool& lock) : Command(Creator, "LOCKSERV", 0), locked(lock)
        {
-               this->source = "m_lockserv.so";
-               syntax.clear();
+               flags_needed = 'o';
        }
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
+               if (locked)
+               {
+                       user->WriteServ("NOTICE %s :The server is already locked.", user->nick.c_str());
+                       return CMD_FAILURE;
+               }
+
                locked = true;
-               user->WriteNumeric(988, "%s %s :Closed for new connections", user->nick.c_str(), user->server);
-               ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used LOCKSERV to temporarily close for new connections", user->nick.c_str());
-               /* Dont send to the network */
-               return CMD_LOCALONLY;
+               user->WriteNumeric(988, "%s %s :Closed for new connections", user->nick.c_str(), user->server.c_str());
+               ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used LOCKSERV to temporarily disallow new connections", user->nick.c_str());
+               return CMD_SUCCESS;
        }
 };
 
@@ -50,20 +58,23 @@ private:
        bool& locked;
 
 public:
-       CommandUnlockserv (InspIRCd* Instance, bool &lock)
-       : Command(Instance, "UNLOCKSERV", "o", 0), locked(lock)
+       CommandUnlockserv(Module* Creator, bool &lock) : Command(Creator, "UNLOCKSERV", 0), locked(lock)
        {
-               this->source = "m_lockserv.so";
-               syntax.clear();
+               flags_needed = 'o';
        }
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
+               if (!locked)
+               {
+                       user->WriteServ("NOTICE %s :The server isn't locked.", user->nick.c_str());
+                       return CMD_FAILURE;
+               }
+
                locked = false;
-               user->WriteNumeric(989, "%s %s :Open for new connections", user->nick.c_str(), user->server);
-               ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used UNLOCKSERV to allow for new connections", user->nick.c_str());
-               /* Dont send to the network */
-               return CMD_LOCALONLY;
+               user->WriteNumeric(989, "%s %s :Open for new connections", user->nick.c_str(), user->server.c_str());
+               ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used UNLOCKSERV to allow new connections", user->nick.c_str());
+               return CMD_SUCCESS;
        }
 };
 
@@ -71,25 +82,21 @@ class ModuleLockserv : public Module
 {
 private:
        bool locked;
-       CommandLockserv* lockcommand;
-       CommandUnlockserv* unlockcommand;
+       CommandLockserv lockcommand;
+       CommandUnlockserv unlockcommand;
 
-       virtual void ResetLocked()
+public:
+       ModuleLockserv() : lockcommand(this, locked), unlockcommand(this, locked)
        {
-               locked = false;
        }
 
-public:
-       ModuleLockserv(InspIRCd* Me) : Module(Me)
+       void init()
        {
-               ResetLocked();
-               lockcommand = new CommandLockserv(ServerInstance, locked);
-               ServerInstance->AddCommand(lockcommand);
-
-               unlockcommand = new CommandUnlockserv(ServerInstance, locked);
-               ServerInstance->AddCommand(unlockcommand);
+               locked = false;
+               ServerInstance->Modules->AddService(lockcommand);
+               ServerInstance->Modules->AddService(unlockcommand);
                Implementation eventlist[] = { I_OnUserRegister, I_OnRehash, I_OnCheckReady };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual ~ModuleLockserv()
@@ -97,29 +104,30 @@ public:
        }
 
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
-               ResetLocked();
+               // Emergency way to unlock
+               if (!user) locked = false;
        }
 
-       virtual int OnUserRegister(User* user)
+       virtual ModResult OnUserRegister(LocalUser* user)
        {
                if (locked)
                {
                        ServerInstance->Users->QuitUser(user, "Server is temporarily closed. Please try again later.");
-                       return 1;
+                       return MOD_RES_DENY;
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual bool OnCheckReady(User* user)
+       virtual ModResult OnCheckReady(LocalUser* user)
        {
-               return !locked;
+               return locked ? MOD_RES_DENY : MOD_RES_PASSTHRU;
        }
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR, API_VERSION);
+               return Version("Allows locking of the server to stop all incoming connections until unlocked again", VF_VENDOR);
        }
 };