X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusermanager.h;h=b1c3520e9551db9cfcb7f6b9c9d58206bf41e740;hb=adb26a4e882d317de4e4135f414b7002cafe07a4;hp=1ab48925d865b3b3ea42fab3d2094a281ffc0ac8;hpb=b0d652a15f46bbd05657b39ca1bcadd42769354b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/usermanager.h b/include/usermanager.h
index 1ab48925d..b1c3520e9 100644
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -30,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
 	 */
@@ -49,7 +48,7 @@ class CoreExport UserManager
 	/** Client list stored by UUID. Contains all clients, and is updated
 	 * automatically by the constructor and destructor of User.
 	 */
-	user_hash* uuidlist;
+	user_hash uuidlist;
 
 	/** Local client list, a list containing only local clients
 	 */
@@ -62,7 +61,7 @@ class CoreExport UserManager
 	/** Number of unregistered users online right now.
 	 * (Unregistered means before USER/NICK/dns)
 	 */
-	int unregistered_count;
+	unsigned int unregistered_count;
 
 	/** Map of global ip addresses for clone counting
 	 * XXX - this should be private, but m_clones depends on it currently.
@@ -75,6 +74,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.
@@ -89,10 +98,10 @@ class CoreExport UserManager
 	/** Disconnect a user gracefully
 	 * @param user The user to remove
 	 * @param quitreason The quit reason to show to normal users
-	 * @param operreason The quit reason to show to opers
+	 * @param operreason The quit reason to show to opers, can be NULL if same as quitreason
 	 * @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 = "");
+	void QuitUser(User* user, const std::string& quitreason, const std::string* operreason = NULL);
 
 	/** Add a user to the local clone map
 	 * @param user The user to add
@@ -123,34 +132,30 @@ class CoreExport UserManager
 	 */
 	unsigned long LocalCloneCount(User *user);
 
-	/** Return a count of users, unknown and known connections
-	 * @return The number of users
-	 */
-	unsigned int UserCount();
-
-	/** Return a count of fully registered connections only
-	 * @return The number of registered 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 RegisteredUserCount();
+	unsigned int UserCount() const { return this->clientlist->size(); }
 
-	/** Return a count of opered (umode +o) users only
-	 * @return The number of opers
+	/** Return a count of fully registered connections on the network
+	 * @return The number of registered users on the network
 	 */
-	unsigned int OperCount();
+	unsigned int RegisteredUserCount() { return this->clientlist->size() - this->UnregisteredUserCount(); }
 
-	/** Return a count of unregistered (before NICK/USER) users only
-	 * @return The number of unregistered (unknown) connections
+	/** Return a count of opered (umode +o) users on the network
+	 * @return The number of opers on the network
 	 */
-	unsigned int UnregisteredUserCount();
+	unsigned int OperCount() const { return this->all_opers.size(); }
 
-	/** Return a count of local users on this server only
-	 * @return The number of local users
+	/** Return a count of local unregistered (before NICK/USER) users
+	 * @return The number of local unregistered (unknown) connections
 	 */
-	unsigned int LocalUserCount();
+	unsigned int UnregisteredUserCount() const { return this->unregistered_count; }
 
-	/** Number of users with a certain mode set on them
+	/** Return a count of local registered users
+	 * @return The number of registered local users
 	 */
-	int ModeCount(const char mode);
+	unsigned int LocalUserCount() const { return (this->local_users.size() - this->UnregisteredUserCount()); }
 
 	/** Send a server notice to all local users
 	 * @param text The text format string to send