Give tons more information in the xml feed, should be enough to construct just about...

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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 59ac3fce9f97727e1e5d7f724b990c4c72c7c82e..aaf512019399c9838f95cb7ec67690dafd5f7f04 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -18,7 +18,7 @@
 #include "bancache.h"
 
 /* add a client connection to the sockets list */
-void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip)
+void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip)
 {
        /* NOTE: Calling this one parameter constructor for User automatically
         * allocates a new UUID and places it in the hash_map.
@@ -96,7 +96,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 
        if (!i)
        {
-               User::QuitUser(Instance, New, "Access denied by configuration");
+               this->QuitUser(New, "Access denied by configuration");
                return;
        }
 
@@ -108,10 +108,10 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 
        this->local_users.push_back(New);
 
-       if ((this->local_users.size() > Instance->Config->SoftLimit) || (this->local_users.size() >= Instance->SE->GetMaxFds()))
+       if ((this->local_users.size() > Instance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)Instance->SE->GetMaxFds()))
        {
                Instance->SNO->WriteToSnoMask('A', "Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit);
-               User::QuitUser(Instance, New,"No more connections allowed");
+               this->QuitUser(New,"No more connections allowed");
                return;
        }
 
@@ -127,7 +127,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
         */
        if (socket >= Instance->SE->GetMaxFds())
        {
-               User::QuitUser(Instance, New, "Server is full");
+               this->QuitUser(New, "Server is full");
                return;
        }
 
@@ -146,7 +146,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
                        Instance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString());
                        if (*Instance->Config->MoronBanner)
                                New->WriteServ("NOTICE %s :*** %s", New->nick, Instance->Config->MoronBanner);
-                       User::QuitUser(Instance, New, b->Reason);
+                       this->QuitUser(New, b->Reason);
                        return;
                }
                else
@@ -171,7 +171,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
        if (!Instance->SE->AddFd(New))
        {
                Instance->Logs->Log("USERS", DEBUG,"Internal error on new connection");
-               User::QuitUser(Instance, New, "Internal error handling connection");
+               this->QuitUser(New, "Internal error handling connection");
        }
 
        /* NOTE: even if dns lookups are *off*, we still need to display this.
@@ -189,6 +189,22 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
        }
 }
 
+void UserManager::QuitUser(User *user, const std::string &quitreason, const char* operreason)
+{
+       ServerInstance->Logs->Log("USERS", DEBUG,"QuitUser: %s '%s'", user->nick, quitreason.c_str());
+       user->Write("ERROR :Closing link (%s@%s) [%s]", user->ident, user->host, *operreason ? operreason : quitreason.c_str());
+       user->quietquit = false;
+       user->quitmsg = quitreason;
+
+       if (!*operreason)
+               user->operquitmsg = quitreason;
+       else
+               user->operquitmsg = operreason;
+
+       ServerInstance->GlobalCulls.AddItem(user);
+}
+
+
 void UserManager::AddLocalClone(User *user)
 {
        clonemap::iterator x = local_clones.find(user->GetIPString());