X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspircd.h;h=3993142c706bdf07014d1ce0d5a059ddc5653151;hb=e093c6b953fe7e9624b51839580f4d8f033a7d66;hp=566550376d21a79cbec98fb999011587ffbb6fba;hpb=bc770c5388bc5517be85afb43255cb9f8ead0d33;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/inspircd.h b/include/inspircd.h index 566550376..3993142c7 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -45,7 +45,7 @@ #include #include #include - +#include /** A list of failed port bindings, used for informational purposes on startup */ typedef std::vector > 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) { }