X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_rehash.cpp;h=07183ec7db7f85ddba5456d28031b1cc8892c2c0;hb=02830985a18950497003f3392cf8d6cc30c15c50;hp=7fdb9862ed9101c534549b35354b7f66e2d8e7f2;hpb=b119a88b55e7f5f3260ff21e78a5c9d1cf491cc8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp index 7fdb9862e..07183ec7d 100644 --- a/src/commands/cmd_rehash.cpp +++ b/src/commands/cmd_rehash.cpp @@ -1,75 +1,108 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2008 Craig Edwards * - * 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 . */ -#include "inspircd.h" -#include "xline.h" -#include "commands/cmd_rehash.h" - +#include "inspircd.h" -extern "C" DllExport Command* init_command(InspIRCd* Instance) +/** Handle /REHASH. These command handlers can be reloaded by the core, + * and handle basic RFC1459 commands. Commands within modules work + * the same way, however, they can be fully unloaded, where these + * may not. + */ +class CommandRehash : public Command { - return new CommandRehash(Instance); -} + public: + /** Constructor for rehash. + */ + CommandRehash ( Module* parent) : Command(parent,"REHASH",0) { flags_needed = 'o'; Penalty = 2; syntax = "[]"; } + /** Handle command. + * @param parameters The parameters to the comamnd + * @param pcnt The number of parameters passed to teh command + * @param user The user issuing the command + * @return A value from CmdResult to indicate command success or failure. + */ + CmdResult Handle(const std::vector& parameters, User *user); +}; -CmdResult CommandRehash::Handle (const char* const* parameters, int pcnt, User *user) +CmdResult CommandRehash::Handle (const std::vector& parameters, User *user) { - user->WriteServ("382 %s %s :Rehashing",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName)); - std::string parameter; - std::string old_disabled = ServerInstance->Config->DisabledCommands; - if (pcnt) + std::string param = parameters.size() ? parameters[0] : ""; + + FOREACH_MOD(OnPreRehash, (user, param)); + + if (param.empty()) { - parameter = parameters[0]; + // standard rehash of local server } - else + else if (param.find_first_of("*.") != std::string::npos) { - ServerInstance->SNO->WriteToSnoMask('A', "%s is rehashing config file %s",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName)); - ServerInstance->Logs->CloseLogs(); - if (!ServerInstance->OpenLog(ServerInstance->Config->argv, ServerInstance->Config->argc)) - user->WriteServ("NOTICE %s :*** ERROR: Could not open logfile %s: %s", user->nick, ServerInstance->Config->logpath.c_str(), strerror(errno)); - ServerInstance->RehashUsersAndChans(); - FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect()); - if (!ServerInstance->ConfigThread) + // rehash of servers by server name (with wildcard) + if (!InspIRCd::Match(ServerInstance->Config->ServerName, parameters[0])) { - ServerInstance->ConfigThread = new ConfigReaderThread(ServerInstance, false, user); - ServerInstance->Threads->Create(ServerInstance->ConfigThread); + // Doesn't match us. PreRehash is already done, nothing left to do + return CMD_SUCCESS; } - else - { - /* A rehash is already in progress! ahh shit. */ - user->WriteServ("*** NOTICE %s :*** Could not rehash: A rehash is already in progress.", user->nick); - return CMD_FAILURE; - } - /* TODO: - * ALL THIS STUFF HERE NEEDS TO BE HOOKED TO THE 'DEATH' OF THE REHASH THREAD - * VIA SOME NOTIFICATION EVENT. WE CANT JUST CALL IT ALL HERE. - * -- B - */ - // Get XLine to do it's thing. - /*ServerInstance->XLines->CheckELines(); - ServerInstance->XLines->ApplyLines(); - ServerInstance->Res->Rehash(); - ServerInstance->ResetMaxBans();*/ + } + else + { + // parameterized rehash + + // the leading "-" is optional; remove it if present. + if (param[0] == '-') + param = param.substr(1); + + FOREACH_MOD(OnModuleRehash, (user, param)); + return CMD_SUCCESS; } - /* TODO: Same as above for all this stuff, really */ - if (old_disabled != ServerInstance->Config->DisabledCommands) - InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance); + // Rehash for me. Try to start the rehash thread + if (!ServerInstance->ConfigThread) + { + std::string m = user->nick + " is rehashing config file " + FileSystem::GetFileName(ServerInstance->ConfigFileName) + " on " + ServerInstance->Config->ServerName; + ServerInstance->SNO->WriteGlobalSno('a', m); - FOREACH_MOD(I_OnRehash,OnRehash(user, parameter)); + if (IS_LOCAL(user)) + user->WriteNumeric(RPL_REHASHING, "%s :Rehashing", FileSystem::GetFileName(ServerInstance->ConfigFileName).c_str()); + else + ServerInstance->PI->SendUserNotice(user, "*** Rehashing server " + FileSystem::GetFileName(ServerInstance->ConfigFileName)); - ServerInstance->BuildISupport(); + /* Don't do anything with the logs here -- logs are restarted + * after the config thread has completed. + */ + ServerInstance->Rehash(user->uuid); + } + else + { + /* + * A rehash is already in progress! ahh shit. + * XXX, todo: we should find some way to kill runaway rehashes that are blocking, this is a major problem for unrealircd users + */ + if (IS_LOCAL(user)) + user->WriteNotice("*** Could not rehash: A rehash is already in progress."); + else + ServerInstance->PI->SendUserNotice(user, "*** Could not rehash: A rehash is already in progress."); + } + // Always return success so spanningtree forwards an incoming REHASH even if we failed return CMD_SUCCESS; } + +COMMAND_INIT(CommandRehash)