X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globalload.cpp;h=f65e01d883f44bf5c4392b761f42d928c73b371d;hb=df4f0dc888a2a24e7f8b42a1c21670679e633506;hp=1cb14ba832a3c1d72259ca4717f3eb6261a23c2b;hpb=a7b0c26a4c56440e4bc5ddc6d3ecfeb36089dbb2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp index 1cb14ba83..f65e01d88 100644 --- a/src/modules/m_globalload.cpp +++ b/src/modules/m_globalload.cpp @@ -2,121 +2,140 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * 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; - /* $ModDesc: Allows global loading of a module. */ -#include +#include "inspircd.h" #include "users.h" #include "channels.h" #include "modules.h" -#include "inspircd.h" -#include "helperfuncs.h" -extern InspIRCd *ServerInstance; - +/** Handle /GLOADMODULE + */ class cmd_gloadmodule : public command_t { public: - cmd_gloadmodule () : command_t("GLOADMODULE", 'o', 1) + cmd_gloadmodule (InspIRCd* Instance) : command_t(Instance,"GLOADMODULE", 'o', 1) { this->source = "m_globalload.so"; + syntax = ""; } - void Handle (char **parameters, int pcnt, userrec *user) + CmdResult Handle (const char** parameters, int pcnt, userrec *user) { if (ServerInstance->LoadModule(parameters[0])) { - WriteOpers("*** NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0],user->nick); - WriteServ(user->fd,"975 %s %s :Module successfully loaded.",user->nick, parameters[0]); + ServerInstance->WriteOpers("*** NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0],user->nick); + user->WriteServ("975 %s %s :Module successfully loaded.",user->nick, parameters[0]); + + /* route it! */ + return CMD_SUCCESS; } else { - WriteServ(user->fd,"974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError()); + user->WriteServ("974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError()); + /* XXX - returning CMD_FAILURE here could potentially mean half the net loads it, half doesn't. pass it on anyway? -- w00t + * + * Returning CMD_SUCCESS would have the same effect, just with less servers. Someone should update this module to properly + * pass the success/failure for each server to the caller (or to all opers) -Special */ + return CMD_FAILURE; } } }; +/** Handle /GUNLOADMODULE + */ class cmd_gunloadmodule : public command_t { public: - cmd_gunloadmodule () : command_t("GUNLOADMODULE", 'o', 1) + cmd_gunloadmodule (InspIRCd* Instance) : command_t(Instance,"GUNLOADMODULE", 'o', 1) { this->source = "m_globalload.so"; + syntax = ""; } - void Handle (char **parameters, int pcnt, userrec *user) + CmdResult Handle (const char** parameters, int pcnt, userrec *user) { if (ServerInstance->UnloadModule(parameters[0])) { - WriteOpers("*** MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0],user->nick); - WriteServ(user->fd,"973 %s %s :Module successfully unloaded.",user->nick, parameters[0]); + ServerInstance->WriteOpers("*** MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0],user->nick); + user->WriteServ("973 %s %s :Module successfully unloaded.",user->nick, parameters[0]); } else { - WriteServ(user->fd,"972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError()); + /* Return CMD_SUCCESS so the module will be unloaded on any servers it is loaded on - this is a seperate case entirely from loading -Special */ + user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError()); } + return CMD_SUCCESS; } }; -class ModuleGlobalLoad : public Module +/** Handle /GRELOADMODULE + */ +class cmd_greloadmodule : public command_t { - cmd_gloadmodule *mycommand; - cmd_gunloadmodule *mycommand2; - Server *Srv; public: - ModuleGlobalLoad(Server* Me) : Module::Module(Me) - { - Srv = Me; - mycommand = new cmd_gloadmodule(); - mycommand2 = new cmd_gunloadmodule(); - Srv->AddCommand(mycommand); - Srv->AddCommand(mycommand2); - } - - virtual ~ModuleGlobalLoad() + cmd_greloadmodule (InspIRCd* Instance) : command_t(Instance, "GRELOADMODULE", 'o', 1) { + this->source = "m_globalload.so"; + syntax = ""; } - - virtual Version GetVersion() + + CmdResult Handle(const char** parameters, int pcnt, userrec *user) { - return Version(1, 0, 0, 0, VF_VENDOR); + if (!ServerInstance->UnloadModule(parameters[0])) + { + user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError()); + return CMD_FAILURE; + } + + if (!ServerInstance->LoadModule(parameters[0])) + { + user->WriteServ("974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError()); + return CMD_FAILURE; + } + + ServerInstance->WriteOpers("*** MODULE '%s' GLOBALLY RELOADED BY '%s'",parameters[0],user->nick); + user->WriteServ("975 %s %s :Module successfully loaded.",user->nick, parameters[0]); + + return CMD_SUCCESS; } }; - -class ModuleGlobalLoadFactory : public ModuleFactory +class ModuleGlobalLoad : public Module { + cmd_gloadmodule *mycommand; + cmd_gunloadmodule *mycommand2; + cmd_greloadmodule *mycommand3; + public: - ModuleGlobalLoadFactory() + ModuleGlobalLoad(InspIRCd* Me) : Module(Me) { + + mycommand = new cmd_gloadmodule(ServerInstance); + mycommand2 = new cmd_gunloadmodule(ServerInstance); + mycommand3 = new cmd_greloadmodule(ServerInstance); + ServerInstance->AddCommand(mycommand); + ServerInstance->AddCommand(mycommand2); + ServerInstance->AddCommand(mycommand3); } - ~ModuleGlobalLoadFactory() + virtual ~ModuleGlobalLoad() { } - virtual Module * CreateModule(Server* Me) + virtual Version GetVersion() { - return new ModuleGlobalLoad(Me); + return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleGlobalLoadFactory; -} +MODULE_INIT(ModuleGlobalLoad)