X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspircd.h;h=b7827f315e3b6a7c2ac7deefbf04c62711b6508c;hb=8ed74be517990d100bdfe237a002d5115ea85a5e;hp=ae46569a01f9314591a5a10c5c137bb9b3653793;hpb=f4472dd6dcdfbb5d4a2a50ddc615644c3b2c8145;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index ae46569a0..b7827f315 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -73,8 +73,12 @@ typedef std::vector< KeyVal > KeyValList;
  */
 typedef std::multimap< std::string, KeyValList > ConfigDataHash;
 
+class InspIRCd;
+extern InspIRCd* ServerInstance;
+
 #include "inspircd_config.h"
 #include "inspircd_version.h"
+#include "extensible.h"
 #include "numerics.h"
 #include "uid.h"
 #include "users.h"
@@ -273,7 +277,6 @@ class serverstats : public classbase
 
 class InspIRCd;
 
-DEFINE_HANDLER1(ProcessUserHandler, void, User*);
 DEFINE_HANDLER2(IsNickHandler, bool, const char*, size_t);
 DEFINE_HANDLER1(IsIdentHandler, bool, const char*);
 DEFINE_HANDLER1(FloodQuitUserHandler, void, User*);
@@ -290,13 +293,12 @@ class BanCacheManager;
  */
 class CoreExport ConfigReaderThread : public Thread
 {
-	InspIRCd* ServerInstance;
 	ServerConfig* Config;
 	bool done;
  public:
 	std::string TheUserUID;
-	ConfigReaderThread(InspIRCd* Instance, const std::string &useruid)
-		: Thread(), ServerInstance(Instance), done(false), TheUserUID(useruid)
+	ConfigReaderThread(const std::string &useruid)
+		: Thread(), done(false), TheUserUID(useruid)
 	{
 	}
 
@@ -382,7 +384,6 @@ class CoreExport InspIRCd : public classbase
 
 	/**** Functors ****/
 
-	ProcessUserHandler HandleProcessUser;
 	IsNickHandler HandleIsNick;
 	IsIdentHandler HandleIsIdent;
 	FloodQuitUserHandler HandleFloodQuitUser;
@@ -390,11 +391,6 @@ class CoreExport InspIRCd : public classbase
 	IsSIDHandler HandleIsSID;
 	RehashHandler HandleRehash;
 
-	/** BufferedSocket classes pending deletion after being closed.
-	 * We don't delete these immediately as this may cause a segmentation fault.
-	 */
-	std::map<BufferedSocket*,BufferedSocket*> SocketCull;
-
 	/** 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
 	 * Reason for it:
 	 * kludge alert!
@@ -425,17 +421,13 @@ class CoreExport InspIRCd : public classbase
 	 */
 	void BuildISupport();
 
-	/** List of server names we've seen.
-	 */
-	servernamelist servernames;
-
 	/** Time this ircd was booted
 	 */
 	time_t startup_time;
 
 	/** Config file pathname specified on the commandline or via ./configure
 	 */
-	char ConfigFileName[MAXBUF];
+	std::string ConfigFileName;
 
 	/** Mode handler, handles mode setting and removal
 	 */
@@ -523,13 +515,6 @@ class CoreExport InspIRCd : public classbase
 	 */
 	time_t Time();
 
-	/** Process a user whos socket has been flagged as active
-	 * @param cu The user to process
-	 * @return There is no actual return value, however upon exit, the user 'cu' may have been
-	 * marked for deletion in the global CullList.
-	 */
-	caller1<void, User*> ProcessUser;
-
 	/** Bind all ports specified in the configuration file.
 	 * @return The number of ports bound without error
 	 */
@@ -543,24 +528,6 @@ class CoreExport InspIRCd : public classbase
 	 */
 	bool BindSocket(int sockfd, int port, const char* addr, bool dolisten = true);
 
-	/** Adds a server name to the list of servers we've seen
-	 * @param The servername to add
-	 */
-	void AddServerName(const std::string &servername);
-
-	/** Finds a cached char* pointer of a server name,
-	 * This is used to optimize User by storing only the pointer to the name
-	 * @param The servername to find
-	 * @return A pointer to this name, gauranteed to never become invalid
-	 */
-	const char* FindServerNamePtr(const std::string &servername);
-
-	/** Returns true if we've seen the given server name before
-	 * @param The servername to find
-	 * @return True if we've seen this server name before
-	 */
-	bool FindServerName(const std::string &servername);
-
 	/** 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
@@ -568,7 +535,7 @@ class CoreExport InspIRCd : public classbase
 	 * @param servername The servername to find the description of
 	 * @return The description of this server, or of the local server
 	 */
-	std::string GetServerDescription(const char* servername);
+	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
@@ -821,12 +788,12 @@ class CoreExport InspIRCd : public classbase
 	 * @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 char* server);
+	bool ULine(const std::string& server);
 
 	/** Returns true if the uline is 'silent' (doesnt generate
 	 * remote connect notices etc).
 	 */
-	bool SilentULine(const char* server);
+	bool SilentULine(const std::string& server);
 
 	/** Returns the subversion revision ID of this ircd
 	 * @return The revision ID or an empty string
@@ -920,11 +887,6 @@ class CoreExport InspIRCd : public classbase
 	 */
 	int Run();
 
-	/** Force all BufferedSockets to be removed which are due to
-	 * be culled.
-	 */
-	void BufferedSocketCull();
-
 	/** Adds an extban char to the 005 token.
 	 */
 	void AddExtBanChar(char c);
@@ -942,14 +904,14 @@ class CommandModule : public Module
 {
 	Cmd cmd;
  public:
-	CommandModule(InspIRCd* me) : Module(me), cmd(me, this)
+	CommandModule() : cmd(this)
 	{
-		me->AddCommand(&cmd);
+		ServerInstance->AddCommand(&cmd);
 	}
 
 	Version GetVersion()
 	{
-		return Version(cmd.command, VF_VENDOR);
+		return Version(cmd.command, VF_VENDOR|VF_CORE);
 	}
 };