Merge pull request #571 from ShutterQuick/inspircd+checkclone

[user/henk/code/inspircd.git] / src / usermanager.cpp

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index df1d5f9f18a5d0c2c7d92f23375b2c2fd4472f60..e7d1fd05c2bb888eed24d908e7ab92f80660236a 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -23,12 +23,26 @@
 #include "inspircd.h"
 #include "xline.h"
 #include "bancache.h"
+#include "iohook.h"
 
 UserManager::UserManager()
-       : unregistered_count(0), local_count(0)
+       : clientlist(new user_hash)
+       , uuidlist(new user_hash)
+       , unregistered_count(0), local_count(0)
 {
 }
 
+UserManager::~UserManager()
+{
+       for (user_hash::iterator i = clientlist->begin(); i != clientlist->end(); ++i)
+       {
+               delete i->second;
+       }
+
+       delete clientlist;
+       delete uuidlist;
+}
+
 /* add a client connection to the sockets list */
 void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
 {
@@ -98,7 +112,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
         * Check connect class settings and initialise settings into User.
         * This will be done again after DNS resolution. -- w00t
         */
-       New->CheckClass();
+       New->CheckClass(ServerInstance->Config->CCOnConnect);
        if (New->quitting)
                return;
 
@@ -235,7 +249,6 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
        ServerInstance->Users->uuidlist->erase(user->uuid);
 }
 
-
 void UserManager::AddLocalClone(User *user)
 {
        local_clones[user->GetCIDRMask()]++;
@@ -290,42 +303,6 @@ unsigned long UserManager::LocalCloneCount(User *user)
                return 0;
 }
 
-/* this function counts all users connected, wether they are registered or NOT. */
-unsigned int UserManager::UserCount()
-{
-       /*
-        * XXX: Todo:
-        *  As part of this restructuring, move clientlist/etc fields into usermanager.
-        *      -- w00t
-        */
-       return this->clientlist->size();
-}
-
-/* this counts only registered users, so that the percentages in /MAP don't mess up */
-unsigned int UserManager::RegisteredUserCount()
-{
-       return this->clientlist->size() - this->UnregisteredUserCount();
-}
-
-/* return how many users are opered */
-unsigned int UserManager::OperCount()
-{
-       return this->all_opers.size();
-}
-
-/* return how many users are unregistered */
-unsigned int UserManager::UnregisteredUserCount()
-{
-       return this->unregistered_count;
-}
-
-/* return how many local registered users there are */
-unsigned int UserManager::LocalUserCount()
-{
-       /* Doesnt count unregistered clients */
-       return (this->local_count - this->UnregisteredUserCount());
-}
-
 void UserManager::ServerNoticeAll(const char* text, ...)
 {
        std::string message;