Replace loopCall detection in OnUserKick with a check for the m_spanningtree fake...

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

diff --git a/include/usermanager.h b/include/usermanager.h
index 4c50c4292720251ec47471fcf0a54d5d4bc28bf0..01547029ed51df8c518abace37e3f3b7996b7ef7 100644 (file)
--- a/include/usermanager.h
+++ b/include/usermanager.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.
@@ -19,7 +19,7 @@
 /** A list of ip addresses cross referenced against clone counts */
 typedef std::map<irc::string, unsigned int> clonemap;
 
-class CoreExport UserManager : public classbase
+class CoreExport UserManager : public Extensible
 {
  private:
        InspIRCd *ServerInstance;
@@ -28,11 +28,18 @@ class CoreExport UserManager : public classbase
         */
        clonemap local_clones;
  public:
-       UserManager(InspIRCd *Instance)
+       UserManager(InspIRCd *Instance) : ServerInstance(Instance)
        {
-               ServerInstance = Instance;
        }
 
+       ~UserManager()
+       {
+               for (user_hash::iterator i = clientlist->begin();i != clientlist->end();i++)
+               {
+                       delete i->second;
+               }
+               clientlist->clear();
+       }
 
        /** Client list, a hash_map containing all clients, local and remote
         */
@@ -71,7 +78,7 @@ class CoreExport UserManager : public classbase
         * @param ip The IP address of the user
         * @return This function has no return value, but a call to AddClient may remove the user.
         */
-       void AddUser(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip);
+       void AddUser(InspIRCd* Instance, int socket, int port, bool iscached, sockaddr* ip, const std::string &targetip);
 
        /** Disconnect a user gracefully
         * @param user The user to remove
@@ -92,7 +99,7 @@ class CoreExport UserManager : public classbase
        void AddGlobalClone(User *user);
 
        /** Remove all clone counts from the user, you should
-        * use this if you change the user's IP address 
+        * use this if you change the user's IP address
         * after they have registered.
         * @param user The user to remove
         */