Fix m_nationalchars using a copy and paste of my unsafe copy and paste algorithm...

[user/henk/code/inspircd.git] / include / inspircd.h

diff --git a/include/inspircd.h b/include/inspircd.h
index 12e22794dddc99edbf85036d8274fc3bcf5c02cc..cbeb8971389e103be1f5d6789441a01a7a366246 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -42,10 +42,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 +67,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 +277,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 +391,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 +401,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 +411,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
         */
@@ -446,6 +451,10 @@ class CoreExport InspIRCd : public classbase
         */
        ThreadEngine* Threads;
 
+       /** Mutex engine, handles mutexes for threading where required
+        */
+       MutexFactory* Mutexes;
+
        /** The thread/class used to read config files in REHASH and on startup
         */
        ConfigReaderThread* ConfigThread;