Only announce Q:Line hits on NICK from unregistered users, thanks satmd.

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

diff --git a/include/inspircd.h b/include/inspircd.h
index 12e22794dddc99edbf85036d8274fc3bcf5c02cc..3993142c706bdf07014d1ce0d5a059ddc5653151 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -45,7 +45,7 @@
 #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 +66,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 +276,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)
        {
        }
 
@@ -446,6 +448,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;