And another tiny one

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

diff --git a/src/users.cpp b/src/users.cpp
index 2f1c86a33a62e223f6bd84e0d39e3d56fffc500b..731f5a603a1c66e3f4cf1ce6b7b92014fca90abf 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -181,7 +181,7 @@ User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance
        Penalty = 0;
        lines_in = lastping = signon = idle_lastmsg = nping = registered = 0;
        ChannelCount = timeout = bytes_in = bytes_out = cmds_in = cmds_out = 0;
-       OverPenalty = ExemptFromPenalty = muted = exempt = haspassed = dns_done = false;
+       OverPenalty = ExemptFromPenalty = quitting = exempt = haspassed = dns_done = false;
        fd = -1;
        recvq.clear();
        sendq.clear();
@@ -196,7 +196,7 @@ User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance
        memset(modes,0,sizeof(modes));
        memset(snomasks,0,sizeof(snomasks));
        /* Invalidate cache */
-       operquit = cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL;
+       cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL;
 
        if (uid.empty())
                strlcpy(uuid, Instance->GetUID().c_str(), UUID_LENGTH);
@@ -210,20 +210,6 @@ User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance
                (*Instance->uuidlist)[uuid] = this;
        else
                throw CoreException("Duplicate UUID "+std::string(uuid)+" in User constructor");
-
-       (*(Instance->clientlist))[this->uuid] = this;
-
-       /* The users default nick is their UUID */
-       strlcpy(this->nick, this->uuid, NICKMAX - 1);
-
-       this->server = Instance->FindServerNamePtr(Instance->Config->ServerName);
-       /* We don't need range checking here, we KNOW 'unknown\0' will fit into the ident field. */
-       strcpy(this->ident, "unknown");
-
-       this->registered = REG_NONE;
-       this->signon = Instance->Time() + Instance->Config->dns_timeout;
-       this->lastping = 1;
-
 }
 
 User::~User()
@@ -242,8 +228,7 @@ User::~User()
 
        this->InvalidateCache();
        this->DecrementModes();
-       if (operquit)
-               free(operquit);
+
        if (ip)
        {
                ServerInstance->Users->RemoveCloneCounts(this);
@@ -467,7 +452,7 @@ bool User::AddBuffer(std::string a)
                if (this->MyClass && (recvq.length() > this->MyClass->GetRecvqMax()))
                {
                        this->SetWriteError("RecvQ exceeded");
-                       ServerInstance->WriteOpers("*** User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->MyClass->GetRecvqMax());
+                       ServerInstance->SNO->WriteToSnoMask('A', "User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->MyClass->GetRecvqMax());
                        return false;
                }
 
@@ -539,12 +524,12 @@ void User::AddWriteBuf(const std::string &data)
        if (this->MyClass && (sendq.length() + data.length() > this->MyClass->GetSendqMax()))
        {
                /*
-                * Fix by brain - Set the error text BEFORE calling writeopers, because
+                * Fix by brain - Set the error text BEFORE calling, because
                 * if we dont it'll recursively  call here over and over again trying
                 * to repeatedly add the text to the sendq!
                 */
                this->SetWriteError("SendQ exceeded");
-               ServerInstance->WriteOpers("*** User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->MyClass->GetSendqMax());
+               ServerInstance->SNO->WriteToSnoMask('A', "User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->MyClass->GetSendqMax());
                return;
        }
 
@@ -558,7 +543,7 @@ void User::AddWriteBuf(const std::string &data)
        catch (...)
        {
                this->SetWriteError("SendQ exceeded");
-               ServerInstance->WriteOpers("*** User %s SendQ got an exception",this->nick);
+               ServerInstance->SNO->WriteToSnoMask('A', "User %s SendQ got an exception",this->nick);
        }
 }
 
@@ -723,8 +708,10 @@ void User::QuitUser(InspIRCd* Instance, User *user, const std::string &quitreaso
 {
        Instance->Log(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->muted = true;
-       Instance->GlobalCulls.AddItem(user, quitreason.c_str(), operreason);
+       user->quietquit = false;
+       user->quitmsg = quitreason;
+       user->operquitmsg = operreason;
+       Instance->GlobalCulls.AddItem(user);
 }
 
 /* adds or updates an entry in the whowas list */
@@ -754,13 +741,13 @@ void User::CheckClass()
        else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal()))
        {
                User::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (local)");
-               ServerInstance->WriteOpers("*** WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString());
+               ServerInstance->SNO->WriteToSnoMask('A', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString());
                return;
        }
        else if ((a->GetMaxGlobal()) && (ServerInstance->Users->GlobalCloneCount(this) > a->GetMaxGlobal()))
        {
                User::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (global)");
-               ServerInstance->WriteOpers("*** WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString());
+               ServerInstance->SNO->WriteToSnoMask('A', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString());
                return;
        }
 
@@ -797,7 +784,6 @@ void User::FullConnect()
 
                if (r)
                {
-                       this->muted = true;
                        r->Apply(this);
                        return;
                }
@@ -806,7 +792,6 @@ void User::FullConnect()
 
                if (n)
                {
-                       this->muted = true;
                        n->Apply(this);
                        return;
                }
@@ -1714,6 +1699,9 @@ void User::ShowRULES()
 
 void User::HandleEvent(EventType et, int errornum)
 {
+       if (this->quitting) // drop everything, user is due to be quit
+               return;
+
        /* WARNING: May delete this user! */
        int thisfd = this->GetFd();
 
@@ -1750,15 +1738,12 @@ void User::HandleEvent(EventType et, int errornum)
 
 void User::SetOperQuit(const std::string &oquit)
 {
-       if (operquit)
-               return;
-
-       operquit = strdup(oquit.c_str());
+       operquitmsg = oquit;
 }
 
 const char* User::GetOperQuit()
 {
-       return operquit ? operquit : "";
+       return operquitmsg.c_str();
 }
 
 void User::IncreasePenalty(int increase)