Remove spanningtree override of /LUSERS

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

diff --git a/include/configreader.h b/include/configreader.h
index 4b42bcd435e83f5c2b744433ce483ff5ae9b0bec..e9bcbdb2c0213e13183ebe0229524807eaa2ec57 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -376,11 +376,6 @@ class CoreExport ServerConfig
         */
        bool RestrictBannedUsers;
 
-       /** If this value is true, halfops have been
-        * enabled in the configuration file.
-        */
-       bool AllowHalfop;
-
        /** If this is set to true, then mode lists (e.g
         * MODE #chan b) are hidden from unprivileged
         * users.
@@ -419,11 +414,6 @@ class CoreExport ServerConfig
         */
        int MaxWhoResults;
 
-       /** How many seconds to wait before exiting
-        * the program when /DIE is correctly issued.
-        */
-       int DieDelay;
-
        /** True if we're going to hide netsplits as *.net *.split for non-opers
         */
        bool HideSplits;
@@ -598,4 +588,29 @@ class CoreExport ServerConfig
 
 };
 
+/** The background thread for config reading, so that reading from executable includes
+ * does not block.
+ */
+class CoreExport ConfigReaderThread : public Thread
+{
+       ServerConfig* Config;
+       volatile bool done;
+ public:
+       const std::string TheUserUID;
+       ConfigReaderThread(const std::string &useruid)
+               : Config(new ServerConfig), done(false), TheUserUID(useruid)
+       {
+       }
+
+       virtual ~ConfigReaderThread()
+       {
+               delete Config;
+       }
+
+       void Run();
+       /** Run in the main thread to apply the configuration */
+       void Finish();
+       bool IsDone() { return done; }
+};
+
 #endif