X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspircd.h;h=ef6c86f285d52d49001e3194a588e0750a41f059;hb=af0bd57ff5b55e8e4602b4a52268bfbfc9c5c442;hp=f32a676444e6cc4ee72b601afd51f0cebb300d88;hpb=f9e6de5284aaacd55aa389445cd595bdcaa8339e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index f32a67644..ef6c86f28 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -43,6 +43,7 @@
 #include <cmath>
 #include <cstring>
 #include <climits>
+#include <cstdio>
 
 #include <sstream>
 #include <string>
@@ -96,6 +97,7 @@ typedef std::multimap< std::string, KeyValList > ConfigDataHash;
 #include "inspstring.h"
 #include "protocol.h"
 #include "threadengine.h"
+#include "fakeuser.h"
 
 #ifndef PATH_MAX
 #warning Potentially broken system, PATH_MAX undefined
@@ -273,7 +275,6 @@ class InspIRCd;
 DEFINE_HANDLER1(ProcessUserHandler, void, User*);
 DEFINE_HANDLER2(IsNickHandler, bool, const char*, size_t);
 DEFINE_HANDLER1(IsIdentHandler, bool, const char*);
-DEFINE_HANDLER1(FindDescriptorHandler, User*, int);
 DEFINE_HANDLER1(FloodQuitUserHandler, void, User*);
 DEFINE_HANDLER2(IsChannelHandler, bool, const char*, size_t);
 DEFINE_HANDLER1(IsSIDHandler, bool, const std::string&);
@@ -289,10 +290,12 @@ class BanCacheManager;
 class CoreExport ConfigReaderThread : public Thread
 {
 	InspIRCd* ServerInstance;
-	bool do_bail;
-	std::string TheUserUID;
+	ServerConfig* Config;
+	bool done;
  public:
-	ConfigReaderThread(InspIRCd* Instance, bool bail, const std::string &useruid) : Thread(), ServerInstance(Instance), do_bail(bail), TheUserUID(useruid)
+	std::string TheUserUID;
+	ConfigReaderThread(InspIRCd* Instance, const std::string &useruid)
+		: Thread(), ServerInstance(Instance), done(false), TheUserUID(useruid)
 	{
 	}
 
@@ -301,6 +304,9 @@ class CoreExport ConfigReaderThread : public Thread
 	}
 
 	void Run();
+	/** Run in the main thread to apply the configuration */
+	void Finish();
+	bool IsDone() { return done; }
 };
 
 /** The main class of the irc server.
@@ -386,7 +392,6 @@ class CoreExport InspIRCd : public classbase
 	ProcessUserHandler HandleProcessUser;
 	IsNickHandler HandleIsNick;
 	IsIdentHandler HandleIsIdent;
-	FindDescriptorHandler HandleFindDescriptor;
 	FloodQuitUserHandler HandleFloodQuitUser;
 	IsChannelHandler HandleIsChannel;
 	IsSIDHandler HandleIsSID;
@@ -397,8 +402,6 @@ class CoreExport InspIRCd : public classbase
 	 */
 	std::map<BufferedSocket*,BufferedSocket*> SocketCull;
 
-	Mutex RehashFinishMutex;
-
 	/** 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!
@@ -407,7 +410,7 @@ class CoreExport InspIRCd : public classbase
 	 * hash and set its descriptor to FD_MAGIC_NUMBER so the data
 	 * falls into the abyss :p
 	 */
-	User* FakeClient;
+	FakeUser* FakeClient;
 
 	/** Returns the next available UID for this server.
 	 */
@@ -508,6 +511,10 @@ class CoreExport InspIRCd : public classbase
 	 */
 	chan_hash* chanlist;
 
+	/** List of the open ports
+	 */
+	std::vector<ListenSocketBase *> ports;
+
 	/** Set to the current signal recieved
 	 */
 	int s_signal;
@@ -531,11 +538,9 @@ class CoreExport InspIRCd : public classbase
 	caller1<void, User*> ProcessUser;
 
 	/** Bind all ports specified in the configuration file.
-	 * @param bail True if the function should bail back to the shell on failure
-	 * @param found_ports The actual number of ports found in the config, as opposed to the number actually bound
-	 * @return The number of ports actually bound without error
+	 * @return The number of ports bound without error
 	 */
-	int BindPorts(bool bail, int &found_ports, FailedPortList &failed_ports);
+	int BindPorts(FailedPortList &failed_ports);
 
 	/** Binds a socket on an already open file descriptor
 	 * @param sockfd A valid file descriptor of an open socket
@@ -683,13 +688,6 @@ class CoreExport InspIRCd : public classbase
 	 */
 	caller1<bool, const char*> IsIdent;
 
-	/** Find a username by their file descriptor.
-	 * It is preferred to use this over directly accessing the fd_ref_table array.
-	 * @param socket The file descriptor of a user
-	 * @return A pointer to the user if the user exists locally on this descriptor
-	 */
-	caller1<User*, int> FindDescriptor;
-
 	/** Add a dns Resolver class to this server's active set
 	 * @param r The resolver to add
 	 * @param cached If this value is true, then the cache will