Rename <options:moronbanner> to <options:xlinemessage>.

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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index d6c61d2e35dfc642075133d2794dbcaa7a26ce22..538feaade093e2d1bc2cb36e3eb3c6002b7c97ea 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)
 {
@@ -49,7 +63,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
        UserIOHandler* eh = &New->eh;
 
        /* Give each of the modules an attempt to hook the user for I/O */
-       FOREACH_MOD(I_OnHookIO, OnHookIO(eh, via));
+       FOREACH_MOD(OnHookIO, (eh, via));
 
        if (eh->GetIOHook())
        {
@@ -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;
 
@@ -115,8 +129,8 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
                {
                        /* user banned */
                        ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Positive hit for " + New->GetIPString());
-                       if (!ServerInstance->Config->MoronBanner.empty())
-                               New->WriteNotice("*** " +  ServerInstance->Config->MoronBanner);
+                       if (!ServerInstance->Config->XLineMessage.empty())
+                               New->WriteNotice("*** " +  ServerInstance->Config->XLineMessage);
                        this->QuitUser(New, b->Reason);
                        return;
                }
@@ -148,11 +162,11 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
        if (ServerInstance->Config->RawLog)
                New->WriteNotice("*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.");
 
-       FOREACH_MOD(I_OnSetUserIP,OnSetUserIP(New));
+       FOREACH_MOD(OnSetUserIP, (New));
        if (New->quitting)
                return;
 
-       FOREACH_MOD(I_OnUserInit,OnUserInit(New));
+       FOREACH_MOD(OnUserInit, (New));
 }
 
 void UserManager::QuitUser(User *user, const std::string &quitreason, const char* operreason)
@@ -186,7 +200,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 
        if (user->registered == REG_ALL)
        {
-               FOREACH_MOD(I_OnUserQuit,OnUserQuit(user, reason, oper_reason));
+               FOREACH_MOD(OnUserQuit, (user, reason, oper_reason));
                user->WriteCommonQuit(reason, oper_reason);
        }
 
@@ -197,7 +211,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
        if (IS_LOCAL(user))
        {
                LocalUser* lu = IS_LOCAL(user);
-               FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(lu));
+               FOREACH_MOD(OnUserDisconnect, (lu));
                lu->eh.Close();
        }
 
@@ -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;
@@ -339,19 +316,6 @@ void UserManager::ServerNoticeAll(const char* text, ...)
        }
 }
 
-/* return how many users have a given mode e.g. 'a' */
-int UserManager::ModeCount(const char mode)
-{
-       int c = 0;
-       for(user_hash::iterator i = clientlist->begin(); i != clientlist->end(); ++i)
-       {
-               User* u = i->second;
-               if (u->modes[mode-65])
-                       c++;
-       }
-       return c;
-}
-
 void UserManager::GarbageCollect()
 {
        // Reset the already_sent IDs so we don't wrap it around and drop a message
@@ -362,3 +326,14 @@ void UserManager::GarbageCollect()
                (**i).RemoveExpiredInvites();
        }
 }
+
+/* this returns true when all modules are satisfied that the user should be allowed onto the irc server
+ * (until this returns true, a user will block in the waiting state, waiting to connect up to the
+ * registration timeout maximum seconds)
+ */
+bool UserManager::AllModulesReportReady(LocalUser* user)
+{
+       ModResult res;
+       FIRST_MOD_RESULT(OnCheckReady, res, (user));
+       return (res == MOD_RES_PASSTHRU);
+}