X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=inline;f=include%2Finspircd.h;h=f43141c383152294499f8f9c24c6b15908094bf1;hb=cc74fb0be4ce4a5f55719dcf4b1045fe156ded1b;hp=a25466647563e3047b7d84cbe2e18ed33e7dc181;hpb=50ecf259b61eb389559dc24a7c4af718c225ec8d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index a25466647..f43141c38 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -49,6 +49,7 @@
 CoreExport extern InspIRCd* ServerInstance;
 
 #include "config.h"
+#include "dynref.h"
 #include "consolecolors.h"
 #include "caller.h"
 #include "cull_list.h"
@@ -244,7 +245,6 @@ DEFINE_HANDLER1(IsNickHandler, bool, const std::string&);
 DEFINE_HANDLER2(GenRandomHandler, void, char*, size_t);
 DEFINE_HANDLER1(IsIdentHandler, bool, const std::string&);
 DEFINE_HANDLER1(IsChannelHandler, bool, const std::string&);
-DEFINE_HANDLER1(RehashHandler, void, const std::string&);
 DEFINE_HANDLER3(OnCheckExemptionHandler, ModResult, User*, Channel*, const std::string&);
 
 /** The main class of the irc server.
@@ -295,7 +295,6 @@ class CoreExport InspIRCd
 	IsIdentHandler HandleIsIdent;
 	OnCheckExemptionHandler HandleOnCheckExemption;
 	IsChannelHandler HandleIsChannel;
-	RehashHandler HandleRehash;
 	GenRandomHandler HandleGenRandom;
 
 	/** Globally accessible fake user record. This is used to force mode changes etc across s2s, etc.. bit ugly, but.. better than how this was done in 1.1
@@ -401,7 +400,7 @@ class CoreExport InspIRCd
 
 	/** Holds extensible for user operquit
 	 */
-	LocalStringExt OperQuit;
+	StringExtItem OperQuit;
 
 	/** Manages the generation and transmission of ISUPPORT. */
 	ISupportManager ISupport;
@@ -478,14 +477,10 @@ class CoreExport InspIRCd
 	caller1<bool, const std::string&> IsChannel;
 
 	/** Return true if str looks like a server ID
-	 * @param string to check against
+	 * @param sid string to check against
 	 */
 	static bool IsSID(const std::string& sid);
 
-	/** Rehash the local server
-	 */
-	caller1<void, const std::string&> Rehash;
-
 	/** Handles incoming signals after being set
 	 * @param signal the signal recieved
 	 */
@@ -509,9 +504,9 @@ class CoreExport InspIRCd
 	 */
 	static void QuickExit(int status);
 
-	/** Printf-wrapper.
-	* @param How you want it formatted
-	* @param ...
+	/** Formats the input string with the specified arguments.
+	* @param formatString The string to format
+	* @param ... A variable number of format arguments.
 	* @return The formatted string
 	*/
 	static const char* Format(const char* formatString, ...) CUSTOM_PRINTF(1, 2);
@@ -545,8 +540,8 @@ class CoreExport InspIRCd
 	 * @param mask The glob pattern to match against.
 	 * @param map The character map to use when matching.
 	 */
-	static bool Match(const std::string &str, const std::string &mask, unsigned const char *map = NULL);
-	static bool Match(const char *str, const char *mask, unsigned const char *map = NULL);
+	static bool Match(const std::string& str, const std::string& mask, unsigned const char* map = NULL);
+	static bool Match(const char* str, const char* mask, unsigned const char* map = NULL);
 
 	/** Match two strings using pattern matching, optionally, with a map
 	 * to check case against (may be NULL). If map is null, match will be case insensitive.
@@ -555,8 +550,8 @@ class CoreExport InspIRCd
 	 * @param mask The glob or CIDR pattern to match against.
 	 * @param map The character map to use when matching.
 	 */
-	static bool MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map = NULL);
-	static bool MatchCIDR(const char *str, const char *mask, unsigned const char *map = NULL);
+	static bool MatchCIDR(const std::string& str, const std::string& mask, unsigned const char* map = NULL);
+	static bool MatchCIDR(const char* str, const char* mask, unsigned const char* map = NULL);
 
 	/** Matches a hostname and IP against a space delimited list of hostmasks.
 	 * @param masks The space delimited masks to match against.
@@ -582,8 +577,9 @@ class CoreExport InspIRCd
 	static void ProcessColors(file_cache& input);
 
 	/** Rehash the local server
+	 * @param uuid The uuid of the user who started the rehash, can be empty
 	 */
-	void RehashServer();
+	void Rehash(const std::string& uuid = "");
 
 	/** Check if the given nickmask matches too many users, send errors to the given user
 	 * @param nick A nickmask to match against
@@ -713,11 +709,6 @@ class CommandModule : public Module
 	{
 	}
 
-	void init()
-	{
-		ServerInstance->Modules->AddService(cmd);
-	}
-
 	Version GetVersion()
 	{
 		return Version(cmd.name, VF_VENDOR|VF_CORE);