X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusermanager.h;h=040f91852a73ab024e71189c7d9157a851819a62;hb=0babd8c0783242fc647cdcdfefb399c099e367ad;hp=a807cd447b57de70db5f0d5118042f526eb064bc;hpb=d736eba00b274c87662bd73a3acf8288135643d6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/usermanager.h b/include/usermanager.h
index a807cd447..040f91852 100644
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -32,23 +32,22 @@ class CoreExport UserManager
 	clonemap local_clones;
 
  public:
-	/** Constructor, initializes variables and allocates the hashmaps
+	/** Constructor, initializes variables
 	 */
 	UserManager();
 
-	/** Destructor, destroys all users in clientlist and then deallocates
-	 * the hashmaps
+	/** Destructor, destroys all users in clientlist
 	 */
 	~UserManager();
 
 	/** Client list, a hash_map containing all clients, local and remote
 	 */
-	user_hash* clientlist;
+	user_hash clientlist;
 
 	/** 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
 	 */
@@ -63,10 +62,6 @@ class CoreExport UserManager
 	 */
 	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.
 	 */
@@ -139,12 +134,12 @@ class CoreExport UserManager
 	/** 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() const { return this->clientlist->size(); }
+	unsigned int UserCount() const { return this->clientlist.size(); }
 
 	/** Return a count of fully registered connections on the network
 	 * @return The number of registered users on the network
 	 */
-	unsigned int RegisteredUserCount() { return this->clientlist->size() - this->UnregisteredUserCount(); }
+	unsigned int RegisteredUserCount() { return this->clientlist.size() - this->UnregisteredUserCount(); }
 
 	/** Return a count of opered (umode +o) users on the network
 	 * @return The number of opers on the network
@@ -159,7 +154,12 @@ class CoreExport UserManager
 	/** Return a count of local registered users
 	 * @return The number of registered local users
 	 */
-	unsigned int LocalUserCount() const { return (this->local_count - this->UnregisteredUserCount()); }
+	unsigned int LocalUserCount() const { return (this->local_users.size() - this->UnregisteredUserCount()); }
+
+	/** Get a hash map containing all users, keyed by their nickname
+	 * @return A hash map mapping nicknames to User pointers
+	 */
+	user_hash& GetUsers() { return clientlist; }
 
 	/** Send a server notice to all local users
 	 * @param text The text format string to send