X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspircd.h;h=469d3a3b61e06e85260ad17fde674ee4cc6c9896;hb=c6b11d2130c640bc4a68522aa3b6d48c49fa5d7b;hp=566550376d21a79cbec98fb999011587ffbb6fba;hpb=bc770c5388bc5517be85afb43255cb9f8ead0d33;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index 566550376..469d3a3b6 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -14,6 +14,11 @@
 #ifndef __INSPIRCD_H__
 #define __INSPIRCD_H__
 
+#define _FILE_OFFSET_BITS 64
+#ifndef _LARGEFILE_SOURCE
+#define _LARGEFILE_SOURCE
+#endif
+
 #ifndef WIN32
 #define DllExport
 #define CoreExport
@@ -42,10 +47,11 @@
 #include <sstream>
 #include <string>
 #include <vector>
+#include <list>
 #include <deque>
 #include <map>
 #include <bitset>
-
+#include <set>
 
 /** A list of failed port bindings, used for informational purposes on startup */
 typedef std::vector<std::pair<std::string, std::string> > FailedPortList;
@@ -66,7 +72,6 @@ typedef std::vector< KeyVal > KeyValList;
  */
 typedef std::multimap< std::string, KeyValList > ConfigDataHash;
 
-
 #include "inspircd_config.h"
 #include "numerics.h"
 #include "uid.h"
@@ -277,13 +282,16 @@ DEFINE_HANDLER1(RehashHandler, void, const std::string&);
 class XLineManager;
 class BanCacheManager;
 
+/** The background thread for config reading, so that reading from executable includes
+ * does not block.
+ */
 class CoreExport ConfigReaderThread : public Thread
 {
 	InspIRCd* ServerInstance;
 	bool do_bail;
-	User* TheUser;
+	std::string TheUserUID;
  public:
-	ConfigReaderThread(InspIRCd* Instance, bool bail, User* user) : Thread(), ServerInstance(Instance), do_bail(bail), TheUser(user)
+	ConfigReaderThread(InspIRCd* Instance, bool bail, const std::string &useruid) : Thread(), ServerInstance(Instance), do_bail(bail), TheUserUID(useruid)
 	{
 	}
 
@@ -388,6 +396,8 @@ 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!
@@ -396,7 +406,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;
+	User* FakeClient;
 
 	/** Returns the next available UID for this server.
 	 */
@@ -406,13 +416,13 @@ class CoreExport InspIRCd : public classbase
 	 * @param nick The nickname to find
 	 * @return A pointer to the user, or NULL if the user does not exist
 	 */
-	User *FindUUID(const std::string &);
+	User* FindUUID(const std::string &);
 
 	/** Find a user in the UUID hash
 	 * @param nick The nickname to find
 	 * @return A pointer to the user, or NULL if the user does not exist
 	 */
-	User *FindUUID(const char *);
+	User* FindUUID(const char *);
 
 	/** Build the ISUPPORT string by triggering all modules On005Numeric events
 	 */
@@ -711,7 +721,6 @@ class CoreExport InspIRCd : public classbase
 	 * The parameters provided are identical to that sent to the
 	 * handler for class cmd_mode.
 	 * @param parameters The mode parameters
-	 * @param pcnt The number of items you have given in the first parameter
 	 * @param user The user to send error messages to
 	 */
 	void SendMode(const std::vector<std::string>& parameters, User *user);