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

diff --git a/include/usermanager.h b/include/usermanager.h
index b549edb10..a807cd447 100644
--- 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
 	 */
@@ -52,9 +50,9 @@ class CoreExport UserManager
 	 */
 	user_hash* uuidlist;
 
-	/** Local client list, a vector containing only local clients
+	/** Local client list, a list containing only local clients
 	 */
-	std::vector<LocalUser*> local_users;
+	LocalUserList local_users;
 
 	/** Oper list, a vector containing all local and remote opered users
 	 */
@@ -63,17 +61,36 @@ 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.
 	 */
 	clonemap global_clones;
 
+	/**
+	 * Reset the already_sent IDs so we don't wrap it around and drop a message
+	 * Also removes all expired invites
+     */
+	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.
-	 * @param Instance a pointer to the server instance
 	 * @param socket The socket id (file descriptor) this user is on
 	 * @param via The socket that this user connected using
 	 * @param client The IP address and client port of the user
@@ -84,11 +101,11 @@ class CoreExport UserManager
 
 	/** 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
+	 * @param quitreason The quit reason to show to normal users
+	 * @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
@@ -119,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