Use binary comparison of IP addresses when checking reverse/forward DNS match; fixes...

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

diff --git a/include/inspircd.h b/include/inspircd.h
index 469d3a3b61e06e85260ad17fde674ee4cc6c9896..987272752dc9a603bfb1d2d3196858d282fa723c 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -43,6 +43,7 @@
 #include <cmath>
 #include <cstring>
 #include <climits>
+#include <cstdio>
 
 #include <sstream>
 #include <string>
@@ -95,6 +96,7 @@ typedef std::multimap< std::string, KeyValList > ConfigDataHash;
 #include "configreader.h"
 #include "inspstring.h"
 #include "protocol.h"
+#include "threadengine.h"
 
 #ifndef PATH_MAX
 #warning Potentially broken system, PATH_MAX undefined
@@ -289,9 +291,11 @@ class CoreExport ConfigReaderThread : public Thread
 {
        InspIRCd* ServerInstance;
        bool do_bail;
+       bool done;
        std::string TheUserUID;
  public:
-       ConfigReaderThread(InspIRCd* Instance, bool bail, const std::string &useruid) : Thread(), ServerInstance(Instance), do_bail(bail), TheUserUID(useruid)
+       ConfigReaderThread(InspIRCd* Instance, bool bail, const std::string &useruid)
+               : Thread(), ServerInstance(Instance), do_bail(bail), done(false), TheUserUID(useruid)
        {
        }
 
@@ -300,6 +304,7 @@ class CoreExport ConfigReaderThread : public Thread
        }
 
        void Run();
+       bool IsDone() { return done; }
 };
 
 /** The main class of the irc server.
@@ -396,8 +401,6 @@ 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!
@@ -456,10 +459,6 @@ 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;