X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspircd.h;h=930514169a74f22e2af6be0dcaf3854870954943;hb=e91c34ae364824d0b74c224c13d74534a65f2402;hp=e02a5deb54b52a277493736ad8ecc7ac75b6cd6c;hpb=02830985a18950497003f3392cf8d6cc30c15c50;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index e02a5deb5..930514169 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -43,6 +43,7 @@
 #include <string>
 #include <vector>
 
+#include "intrusive_list.h"
 #include "compat.h"
 #include "typedefs.h"
 
@@ -57,6 +58,7 @@ CoreExport extern InspIRCd* ServerInstance;
 #include "fileutils.h"
 #include "numerics.h"
 #include "uid.h"
+#include "server.h"
 #include "users.h"
 #include "channels.h"
 #include "timer.h"
@@ -131,7 +133,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
@@ -332,10 +334,6 @@ class CoreExport InspIRCd
 	 */
 	CommandParser* Parser;
 
-	/** Socket engine, handles socket activity events
-	 */
-	SocketEngine* SE;
-
 	/** Thread engine, Handles threading where required
 	 */
 	ThreadEngine* Threads;
@@ -445,15 +443,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
@@ -565,7 +554,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
@@ -617,21 +606,9 @@ class CoreExport InspIRCd
 	 * @param data The data from the config file
 	 * @param input The data input by the oper
 	 * @param hashtype The hash from the config file
-	 * @return 0 if the strings match, 1 or -1 if they do not
-	 */
-	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).
+	 * @return True if the strings match, false if they do not
 	 */
-	bool SilentULine(const std::string& server);
+	bool PassCompare(Extensible* ex, const std::string& data, const std::string& input, const std::string& hashtype);
 
 	/** Returns the full version string of this ircd
 	 * @return The version string
@@ -685,7 +662,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,