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 59e840b7b177c8f2d0cac5733ae53c2ff5ff1007..987272752dc9a603bfb1d2d3196858d282fa723c 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -14,6 +14,11 @@
 #ifndef __INSPIRCD_H__
 #define __INSPIRCD_H__
 
+#define _FILE_OFFSET_BITS 64
+#ifndef _LARGEFILE_SOURCE
+#define _LARGEFILE_SOURCE
+#endif
+
 #ifndef WIN32
 #define DllExport
 #define CoreExport
@@ -38,10 +43,12 @@
 #include <cmath>
 #include <cstring>
 #include <climits>
+#include <cstdio>
 
 #include <sstream>
 #include <string>
 #include <vector>
+#include <list>
 #include <deque>
 #include <map>
 #include <bitset>
@@ -89,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
@@ -283,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)
        {
        }
 
@@ -294,6 +304,7 @@ class CoreExport ConfigReaderThread : public Thread
        }
 
        void Run();
+       bool IsDone() { return done; }
 };
 
 /** The main class of the irc server.
@@ -390,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!
@@ -402,14 +411,6 @@ class CoreExport InspIRCd : public classbase
         */
        User* FakeClient;
 
-       /** Seperate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping
-        * if it must.
-        *
-        * This is provided as a pointer so that modules can change it to their custom mapping tables,
-        * e.g. for national character support.
-        */
-       unsigned const char *national_case_sensitive_map;
-
        /** Returns the next available UID for this server.
         */
        std::string GetUID();
@@ -458,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;
@@ -723,7 +720,6 @@ class CoreExport InspIRCd : public classbase
         * The parameters provided are identical to that sent to the
         * handler for class cmd_mode.
         * @param parameters The mode parameters
-        * @param pcnt The number of items you have given in the first parameter
         * @param user The user to send error messages to
         */
        void SendMode(const std::vector<std::string>& parameters, User *user);