X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspircd.h;h=7a8c1fb748e3f7a8ccb418cd36232d917c954090;hb=282138ad0e9ef483ec2a1606376fc5cb6d5f4cbc;hp=2e4b02fac91d095c889e3fa553397aa9b25dc78c;hpb=992674362c5f64bdb8e1942eeaa7612524529cd6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index 2e4b02fac..7a8c1fb74 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -54,8 +54,10 @@ CoreExport extern InspIRCd* ServerInstance;
 #include "caller.h"
 #include "cull_list.h"
 #include "extensible.h"
+#include "fileutils.h"
 #include "numerics.h"
 #include "uid.h"
+#include "server.h"
 #include "users.h"
 #include "channels.h"
 #include "timer.h"
@@ -130,7 +132,7 @@ inline std::string ConvToStr(const bool in)
  */
 inline std::string ConvToStr(char in)
 {
-	return std::string(in,1);
+	return std::string(1, in);
 }
 
 /** Template function to convert any input type to std::string
@@ -245,7 +247,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.
@@ -296,7 +297,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
@@ -446,15 +446,6 @@ class CoreExport InspIRCd
 	 */
 	bool BindSocket(int sockfd, int port, const char* addr, bool dolisten = true);
 
-	/** Gets the GECOS (description) field of the given server.
-	 * If the servername is not that of the local server, the name
-	 * is passed to handling modules which will attempt to determine
-	 * the GECOS that bleongs to the given servername.
-	 * @param servername The servername to find the description of
-	 * @return The description of this server, or of the local server
-	 */
-	std::string GetServerDescription(const std::string& servername);
-
 	/** Find a user in the nick hash.
 	 * If the user cant be found in the nick hash check the uuid hash
 	 * @param nick The nickname to find
@@ -483,10 +474,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
 	 */
@@ -570,7 +557,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
@@ -583,8 +570,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
@@ -625,18 +613,6 @@ class CoreExport InspIRCd
 	 */
 	int PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype);
 
-	/** Check if a given server is a uline.
-	 * An empty string returns true, this is by design.
-	 * @param server The server to check for uline status
-	 * @return True if the server is a uline OR the string is empty
-	 */
-	bool ULine(const std::string& server);
-
-	/** Returns true if the uline is 'silent' (doesnt generate
-	 * remote connect notices etc).
-	 */
-	bool SilentULine(const std::string& server);
-
 	/** Returns the full version string of this ircd
 	 * @return The version string
 	 */
@@ -689,7 +665,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,