X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Finspircd.h;h=d045b347b6ddf59539a22a17d66b9cf0a989f5e8;hb=ad47ea662698e72ff8f79b03512b1e7fe81bdf53;hp=a634eb2c8aa20c348dbbdabf67eea1e26bcd14d8;hpb=146d72fddbcc443e402b3aadcf1eb8195b9d4ab5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index a634eb2c8..d045b347b 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -49,10 +49,12 @@
 CoreExport extern InspIRCd* ServerInstance;
 
 #include "config.h"
+#include "dynref.h"
 #include "consolecolors.h"
 #include "caller.h"
 #include "cull_list.h"
 #include "extensible.h"
+#include "fileutils.h"
 #include "numerics.h"
 #include "uid.h"
 #include "users.h"
@@ -244,7 +246,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 +296,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 +401,7 @@ class CoreExport InspIRCd
 
 	/** Holds extensible for user operquit
 	 */
-	LocalStringExt OperQuit;
+	StringExtItem OperQuit;
 
 	/** Manages the generation and transmission of ISUPPORT. */
 	ISupportManager ISupport;
@@ -482,10 +482,6 @@ class CoreExport InspIRCd
 	 */
 	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
 	 */
@@ -545,8 +541,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 +551,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.
@@ -569,7 +565,7 @@ class CoreExport InspIRCd
 	 * @param mask A nick!user\@host masak to match against
 	 * @return True i the mask is valid
 	 */
-	bool IsValidMask(const std::string &mask);
+	static bool IsValidMask(const std::string& mask);
 
 	/** Strips all color codes from the given string
 	 * @param sentence The string to strip from
@@ -582,8 +578,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
@@ -688,7 +685,7 @@ class CoreExport InspIRCd
 
 	/** Return a time_t as a human-readable string.
 	 */
-	std::string TimeString(time_t curtime);
+	static std::string TimeString(time_t curtime);
 
 	/** Begin execution of the server.
 	 * NOTE: this function NEVER returns. Internally,
@@ -713,11 +710,6 @@ class CommandModule : public Module
 	{
 	}
 
-	void init()
-	{
-		ServerInstance->Modules->AddService(cmd);
-	}
-
 	Version GetVersion()
 	{
 		return Version(cmd.name, VF_VENDOR|VF_CORE);