Patch to not increment nickchange counter for nick changes that would be blocked...

[user/henk/code/inspircd.git] / src / commands / cmd_rehash.cpp

diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp
index c5228148d394a151ed330ea12c12ecbd140ce375..96313829f4c55045e0e61966b1734e95d0f6b70b 100644 (file)
--- a/src/commands/cmd_rehash.cpp
+++ b/src/commands/cmd_rehash.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -16,43 +16,80 @@
 #include "commands/cmd_rehash.h"
 
 
-
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
        return new CommandRehash(Instance);
 }
 
-CmdResult CommandRehash::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandRehash::Handle (const std::vector<std::string>& 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(I_OnPreRehash,OnPreRehash(user, param));
+
+       if (param.empty())
+       {
+               // standard rehash of local server
+       }
+       else if (param.find_first_of("*.") != std::string::npos)
        {
-               parameter = parameters[0];
+               // rehash of servers by server name (with wildcard)
+               if (!InspIRCd::Match(ServerInstance->Config->ServerName, parameters[0]))
+               {
+                       // Doesn't match us. PreRehash is already done, nothing left to do
+                       return CMD_SUCCESS;
+               }
        }
        else
        {
-               ServerInstance->SNO->WriteToSnoMask('O', "%s is rehashing config file %s",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
-               ServerInstance->CloseLog();
-               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));
+               // parameterized rehash
+
+               // 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;
+               ServerInstance->SNO->WriteGlobalSno('a', m);
+
+               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 ") +
+                               ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
+
+               /* Don't do anything with the logs here -- logs are restarted
+                * after the config thread has completed.
+                */
+
                ServerInstance->RehashUsersAndChans();
                FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
-               /*ServerInstance->Config->Read(false,user);*/
-               // Get XLine to do it's thing.
-               ServerInstance->XLines->CheckELines();
-               ServerInstance->XLines->ApplyLines();
-               ServerInstance->Res->Rehash();
-               ServerInstance->ResetMaxBans();
-       }
-       if (old_disabled != ServerInstance->Config->DisabledCommands)
-               InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance);
 
-       FOREACH_MOD(I_OnRehash,OnRehash(user, parameter));
 
-       ServerInstance->BuildISupport();
+               ServerInstance->ConfigThread = new ConfigReaderThread(ServerInstance, user->uuid);
+               ServerInstance->Threads->Start(ServerInstance->ConfigThread);
 
-       return CMD_SUCCESS;
+               return CMD_SUCCESS;
+       }
+       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->WriteServ("NOTICE %s :*** Could not rehash: A rehash is already in progress.", user->nick.c_str());
+               else
+                       ServerInstance->PI->SendUserNotice(user, "*** Could not rehash: A rehash is already in progress.");
+
+               return CMD_FAILURE;
+       }
 }