X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_rehash.cpp;h=5d5caa32abd216d6ad1f59b550066a844a747764;hb=9aa6c07d92fb9c1132f06b8c5781d77ee7086edb;hp=b58d6035ac848933ec233d5d4e54f685bd9053cd;hpb=3ff5e57de4ceca0b3287c826b7b409e5f14196a1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp
index b58d6035a..5d5caa32a 100644
--- a/src/commands/cmd_rehash.cpp
+++ b/src/commands/cmd_rehash.cpp
@@ -13,47 +13,70 @@
 
 #include "inspircd.h"
 #include "xline.h"
-#include "commands/cmd_rehash.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 = "[<servermask>]"; }
+	/** 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<std::string>& parameters, User *user);
+};
 
 CmdResult CommandRehash::Handle (const std::vector<std::string>& parameters, User *user)
 {
-	std::string old_disabled = ServerInstance->Config->DisabledCommands;
+	std::string param = parameters.size() ? parameters[0] : "";
+
+	FOREACH_MOD(I_OnPreRehash,OnPreRehash(user, param));
 
-	if (parameters.size() && parameters[0][0] != '-')
+	if (param.empty())
 	{
+		// standard rehash of local server
+	}
+	else if (param.find_first_of("*.") != std::string::npos)
+	{
+		// rehash of servers by server name (with wildcard)
 		if (!InspIRCd::Match(ServerInstance->Config->ServerName, parameters[0]))
 		{
-			FOREACH_MOD(I_OnRehash,OnRehash(user, parameters[0]));
-			return CMD_SUCCESS; // rehash for a server, and not for us
+			// Doesn't match us. PreRehash is already done, nothing left to do
+			return CMD_SUCCESS;
 		}
 	}
-	else if (parameters.size())
+	else
 	{
-		FOREACH_MOD(I_OnRehash,OnRehash(user, parameters[0]));
-		return CMD_SUCCESS;
-	}
+		// parameterized rehash
 
-	// Rehash for me.
-	FOREACH_MOD(I_OnRehash,OnRehash(user, ""));
-
-	if (IS_LOCAL(user))
-		user->WriteNumeric(RPL_REHASHING, "%s %s :Rehashing",user->nick.c_str(),ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
-	else
-		ServerInstance->PI->SendUserNotice(user, std::string("*** Rehashing server ") + ServerInstance->ConfigFileName);
+		// the leading "-" is optional; remove it if present.
+		if (param[0] == '-')
+			param = param.substr(1);
 
+		FOREACH_MOD(I_OnModuleRehash,OnModuleRehash(user, param));
+		return CMD_SUCCESS;
+	}
 
+	// Rehash for me. Try to start the rehash thread
 	if (!ServerInstance->ConfigThread)
 	{
-		std::string m = user->nick + " is rehashing config file " + ServerConfig::CleanFilename(ServerInstance->ConfigFileName) + " on " + ServerInstance->Config->ServerName;
+		std::string m = user->nick + " is rehashing config file " + ServerConfig::CleanFilename(ServerInstance->ConfigFileName.c_str()) + " on " + ServerInstance->Config->ServerName;
 		ServerInstance->SNO->WriteGlobalSno('a', m);
 
+		if (IS_LOCAL(user))
+			user->WriteNumeric(RPL_REHASHING, "%s %s :Rehashing",
+				user->nick.c_str(),ServerConfig::CleanFilename(ServerInstance->ConfigFileName.c_str()));
+		else
+			ServerInstance->PI->SendUserNotice(user, std::string("*** Rehashing server ") +
+				ServerConfig::CleanFilename(ServerInstance->ConfigFileName.c_str()));
+
 		/* Don't do anything with the logs here -- logs are restarted
 		 * after the config thread has completed.
 		 */
@@ -62,11 +85,10 @@ CmdResult CommandRehash::Handle (const std::vector<std::string>& parameters, Use
 		FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
 
 
-		ServerInstance->Config->RehashUserUID = user->uuid;
-		ServerInstance->Config->RehashParameter = parameters.size() ? parameters[0] : "";
-
-		ServerInstance->ConfigThread = new ConfigReaderThread(ServerInstance, false, ServerInstance->Config->RehashUserUID);
+		ServerInstance->ConfigThread = new ConfigReaderThread(user->uuid);
 		ServerInstance->Threads->Start(ServerInstance->ConfigThread);
+
+		return CMD_SUCCESS;
 	}
 	else
 	{
@@ -81,7 +103,7 @@ CmdResult CommandRehash::Handle (const std::vector<std::string>& parameters, Use
 
 		return CMD_FAILURE;
 	}
-
-	return CMD_SUCCESS;
 }
 
+
+COMMAND_INIT(CommandRehash)