Replace std::deque with std::vector in spanningtree and related modules

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

diff --git a/include/usermanager.h b/include/usermanager.h
index 0fe418ba3fb25dbf02972049fa176b7c983d7da3..a6b5f74e4fbde68a165825a77725131be4036f7c 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
         */
@@ -66,12 +73,20 @@ class CoreExport UserManager : public classbase
         * initialize it as not yet registered, and add it to the socket engine.
         * @param Instance a pointer to the server instance
         * @param socket The socket id (file descriptor) this user is on
-        * @param port The port number this user connected on
         * @param iscached This variable is reserved for future use
-        * @param ip The IP address of the user
+        * @param client The IP address and client port of the user
+        * @param server The server IP address and port used by the user
         * @return This function has no return value, but a call to AddClient may remove the user.
         */
-       void AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip);
+       void AddUser(InspIRCd* Instance, int socket, bool iscached, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server);
+
+       /** Disconnect a user gracefully
+        * @param user The user to remove
+        * @param r The quit reason to show to normal users
+        * @param oreason The quit reason to show to opers
+        * @return Although this function has no return type, on exit the user provided will no longer exist.
+        */
+       void QuitUser(User *user, const std::string &quitreason, const char* operreason = "");
 
        /** Add a user to the local clone map
         * @param user The user to add
@@ -84,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
         */
@@ -138,13 +153,13 @@ class CoreExport UserManager : public classbase
         * @param text The text format string to send
         * @param ... The format arguments
         */
-       void ServerNoticeAll(const char* text, ...);
+       void ServerNoticeAll(const char* text, ...) CUSTOM_PRINTF(2, 3);
 
        /** Send a server message (PRIVMSG) to all local users
         * @param text The text format string to send
         * @param ... The format arguments
         */
-       void ServerPrivmsgAll(const char* text, ...);
+       void ServerPrivmsgAll(const char* text, ...) CUSTOM_PRINTF(2, 3);
 
        /** Send text to all users with a specific set of modes
         * @param modes The modes to check against, without a +, e.g. 'og'
@@ -154,7 +169,7 @@ class CoreExport UserManager : public classbase
         * @param text The text format string to send
         * @param ... The format arguments
         */
-       void WriteMode(const char* modes, int flags, const char* text, ...);
+       void WriteMode(const char* modes, int flags, const char* text, ...) CUSTOM_PRINTF(4, 5);
 };
 
 #endif