Fix some Windows-related problems.

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

diff --git a/include/usermanager.h b/include/usermanager.h
index 812d8e2f2b77b47b37e133d38b77d5c6f2687dd3..c6745ace626d12f2347c6caeccbe881e3b351884 100644 (file)
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -17,8 +17,7 @@
  */
 
 
-#ifndef USERMANAGER_H
-#define USERMANAGER_H
+#pragma once
 
 #include <list>
 
@@ -31,17 +30,16 @@ class CoreExport UserManager
        /** Map of local ip addresses for clone counting
         */
        clonemap local_clones;
+
  public:
-       ~UserManager()
-       {
-               for (user_hash::iterator i = clientlist->begin();i != clientlist->end();i++)
-               {
-                       delete i->second;
-               }
-               clientlist->clear();
-               delete clientlist;
-               delete uuidlist;
-       }
+       /** Constructor, initializes variables and allocates the hashmaps
+        */
+       UserManager();
+
+       /** Destructor, destroys all users in clientlist and then deallocates
+        * the hashmaps
+        */
+       ~UserManager();
 
        /** Client list, a hash_map containing all clients, local and remote
         */
@@ -63,7 +61,11 @@ class CoreExport UserManager
        /** Number of unregistered users online right now.
         * (Unregistered means before USER/NICK/dns)
         */
-       int unregistered_count;
+       unsigned int unregistered_count;
+
+       /** Number of elements in local_users
+        */
+       unsigned int local_count;
 
        /** Map of global ip addresses for clone counting
         * XXX - this should be private, but m_clones depends on it currently.
@@ -76,6 +78,16 @@ class CoreExport UserManager
      */
        void GarbageCollect();
 
+       /** Perform background user events such as PING checks
+        */
+       void DoBackgroundUserStuff();
+
+       /** Returns true when all modules have done pre-registration checks on a user
+        * @param user The user to verify
+        * @return True if all modules have finished checking this user
+        */
+       bool AllModulesReportReady(LocalUser* user);
+
        /** Add a client to the system.
         * This will create a new User, insert it into the user_hash,
         * initialize it as not yet registered, and add it to the socket engine.
@@ -124,49 +136,34 @@ class CoreExport UserManager
         */
        unsigned long LocalCloneCount(User *user);
 
-       /** Return a count of users, unknown and known connections
-        * @return The number of users
+       /** Return a count of all global users, unknown and known connections
+        * @return The number of users on the network, including local unregistered users
         */
-       unsigned int UserCount();
+       unsigned int UserCount() const { return this->clientlist->size(); }
 
-       /** Return a count of fully registered connections only
-        * @return The number of registered users
+       /** Return a count of fully registered connections on the network
+        * @return The number of registered users on the network
         */
-       unsigned int RegisteredUserCount();
+       unsigned int RegisteredUserCount() { return this->clientlist->size() - this->UnregisteredUserCount(); }
 
-       /** Return a count of opered (umode +o) users only
-        * @return The number of opers
+       /** Return a count of opered (umode +o) users on the network
+        * @return The number of opers on the network
         */
-       unsigned int OperCount();
+       unsigned int OperCount() const { return this->all_opers.size(); }
 
-       /** Return a count of unregistered (before NICK/USER) users only
-        * @return The number of unregistered (unknown) connections
+       /** Return a count of local unregistered (before NICK/USER) users
+        * @return The number of local unregistered (unknown) connections
         */
-       unsigned int UnregisteredUserCount();
+       unsigned int UnregisteredUserCount() const { return this->unregistered_count; }
 
-       /** Return a count of local users on this server only
-        * @return The number of local users
+       /** Return a count of local registered users
+        * @return The number of registered local users
         */
-       unsigned int LocalUserCount();
-
-
-
-
-       /** Number of users with a certain mode set on them
-        */
-       int ModeCount(const char mode);
+       unsigned int LocalUserCount() const { return (this->local_count - this->UnregisteredUserCount()); }
 
        /** Send a server notice to all local users
         * @param text The text format string to send
         * @param ... The format arguments
         */
        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, ...) CUSTOM_PRINTF(2, 3);
 };
-
-#endif