Two stage commit: don't set user->muted except in QuitUser (duplicate setting), also...

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

diff --git a/include/inspircd.h b/include/inspircd.h
index ee1a5120a4b1461e67c6b7e8100484a149906619..c60f7c23049b7d7d6b48f8d533a3550551607b76 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -32,6 +32,7 @@
 #include "inspircd_config.h"
 #include "uid.h"
 #include "users.h"
+#include "usermanager.h"
 #include "channels.h"
 #include "socket.h"
 #include "mode.h"
@@ -56,14 +57,6 @@
  */
 #define ETIREDHAMSTERS EAGAIN
 
-/** Delete a pointer, and NULL its value
- */
-template<typename T> inline void DELETE(T* x)
-{
-       delete x;
-       x = NULL;
-}
-
 /** Template function to convert any input type to std::string
  */
 template<typename T> inline std::string ConvNumeric(const T &in)
@@ -219,9 +212,6 @@ class serverstats : public classbase
 /** A list of failed port bindings, used for informational purposes on startup */
 typedef std::vector<std::pair<std::string, long> > FailedPortList;
 
-/** A list of ip addresses cross referenced against clone counts */
-typedef std::map<irc::string, unsigned int> clonemap;
-
 class InspIRCd;
 
 DEFINE_HANDLER1(ProcessUserHandler, void, User*);
@@ -232,6 +222,7 @@ DEFINE_HANDLER1(FloodQuitUserHandler, void, User*);
 
 /* Forward declaration - required */
 class XLineManager;
+class BanCacheManager;
 
 /** The main class of the irc server.
  * This class contains instances of all the other classes
@@ -401,6 +392,11 @@ class CoreExport InspIRCd : public classbase
         */
        ModuleManager* Modules;
 
+       /** BanCacheManager is used to speed up checking of restrictions on connection
+        * to the IRCd.
+        */
+       BanCacheManager *BanCache;
+
        /** Stats class, holds miscellaneous stats counters
         */
        serverstats* stats;
@@ -435,14 +431,6 @@ class CoreExport InspIRCd : public classbase
         */
        std::list<User*> all_opers;
 
-       /** Map of local ip addresses for clone counting
-        */
-       clonemap local_clones;
-
-       /** Map of global ip addresses for clone counting
-        */
-       clonemap global_clones;
-
        /** DNS class, provides resolver facilities to the core and modules
         */
        DNS* Res;
@@ -455,6 +443,10 @@ class CoreExport InspIRCd : public classbase
         */
        XLineManager* XLines;
 
+       /** User manager. Various methods and data associated with users.
+        */
+       UserManager *Users;
+
        /** Set to the current signal recieved
         */
        int s_signal;
@@ -474,16 +466,6 @@ class CoreExport InspIRCd : public classbase
         * @return The old time delta
         */
        int SetTimeDelta(int delta);
-
-       /** Add a user to the local clone map
-        * @param user The user to add
-        */
-       void AddLocalClone(User* user);
-
-       /** Add a user to the global clone map
-        * @param user The user to add
-        */
-       void AddGlobalClone(User* user);
        
        /** Number of users with a certain mode set on them
         */