X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusermanager.h;h=eee076802f866927f11ee1aca287e77140cfdf57;hb=30fc51c6ddca487a1b89da9ab0ab59da003aee36;hp=c6745ace626d12f2347c6caeccbe881e3b351884;hpb=fd1d19d6345943ecdb5ce4ef947f9b3c5c8bca86;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/usermanager.h b/include/usermanager.h index c6745ace6..eee076802 100644 --- a/include/usermanager.h +++ b/include/usermanager.h @@ -21,60 +21,70 @@ #include -/** A list of ip addresses cross referenced against clone counts */ -typedef std::map clonemap; - -class CoreExport UserManager +class CoreExport UserManager : public fakederef { + public: + struct CloneCounts + { + unsigned int global; + unsigned int local; + CloneCounts() : global(0), local(0) { } + }; + + /** Container that maps IP addresses to clone counts + */ + typedef std::map CloneMap; + + /** Sequence container in which each element is a User* + */ + typedef std::vector OperList; + + /** A list holding local users + */ + typedef insp::intrusive_list LocalList; + private: - /** Map of local ip addresses for clone counting + /** Map of IP addresses for clone counting */ - clonemap local_clones; + CloneMap clonemap; + + /** A CloneCounts that contains zero for both local and global + */ + const CloneCounts zeroclonecounts; + + /** Local client list, a list containing only local clients + */ + LocalList local_users; 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; - - /** Local client list, a list containing only local clients - */ - LocalUserList local_users; + user_hash uuidlist; /** Oper list, a vector containing all local and remote opered users */ - std::list all_opers; + OperList all_opers; /** Number of unregistered users online right now. * (Unregistered means before USER/NICK/dns) */ 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(); @@ -102,20 +112,15 @@ 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 = ""); - - /** Add a user to the local clone map - * @param user The user to add - */ - void AddLocalClone(User *user); + void QuitUser(User* user, const std::string& quitreason, const std::string* operreason = NULL); - /** Add a user to the global clone map + /** Add a user to the clone map * @param user The user to add */ - void AddGlobalClone(User *user); + void AddClone(User* user); /** Remove all clone counts from the user, you should * use this if you change the user's IP address @@ -124,27 +129,32 @@ class CoreExport UserManager */ void RemoveCloneCounts(User *user); - /** Return the number of global clones of this user - * @param user The user to get a count for - * @return The global clone count of this user + /** Rebuild clone counts + */ + void RehashCloneCounts(); + + /** Return the number of local and global clones of this user + * @param user The user to get the clone counts for + * @return The clone counts of this user. The returned reference is volatile - you + * must assume that it becomes invalid as soon as you call any function other than + * your own. */ - unsigned long GlobalCloneCount(User *user); + const CloneCounts& GetCloneCounts(User* user) const; - /** Return the number of local clones of this user - * @param user The user to get a count for - * @return The local clone count of this user + /** Return a map containg IP addresses and their clone counts + * @return The clone count map */ - unsigned long LocalCloneCount(User *user); + const CloneMap& GetCloneMap() const { return clonemap; } /** 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 +169,17 @@ 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; } + + /** Get a list containing all local users + * @return A const list of local users + */ + const LocalList& GetLocalUsers() const { return local_users; } /** Send a server notice to all local users * @param text The text format string to send