This won't work yet.

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

diff --git a/src/users.cpp b/src/users.cpp
index 74c64e730008540d7a0a58358fe897482d0d6767..3803a7a9efebeeeea00e209f689b558dd0e71ab3 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -179,7 +179,7 @@ User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance
        age = ServerInstance->Time(true);
        Penalty = 0;
        lines_in = lastping = signon = idle_lastmsg = nping = registered = 0;
-       ChannelCount = timeout = flood = bytes_in = bytes_out = cmds_in = cmds_out = 0;
+       ChannelCount = timeout = bytes_in = bytes_out = cmds_in = cmds_out = 0;
        OverPenalty = ExemptFromPenalty = muted = exempt = haspassed = dns_done = false;
        fd = -1;
        recvq.clear();
@@ -495,10 +495,10 @@ bool User::AddBuffer(std::string a)
                if (a.length())
                        recvq.append(a);
 
-               if (recvq.length() > (unsigned)this->recvqmax)
+               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->recvqmax);
+                       ServerInstance->WriteOpers("*** User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->MyClass->GetRecvqMax());
                        return false;
                }
 
@@ -567,7 +567,7 @@ void User::AddWriteBuf(const std::string &data)
        if (*this->GetWriteError())
                return;
 
-       if (sendq.length() + data.length() > (unsigned)this->sendqmax)
+       if (this->MyClass && (sendq.length() + data.length() > this->MyClass->GetSendqMax()))
        {
                /*
                 * Fix by brain - Set the error text BEFORE calling writeopers, because
@@ -575,7 +575,7 @@ void User::AddWriteBuf(const std::string &data)
                 * 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->sendqmax);
+               ServerInstance->WriteOpers("*** User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->MyClass->GetSendqMax());
                return;
        }
 
@@ -830,10 +830,11 @@ void User::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, in
        }
 #endif
 
-       New->exempt = (Instance->XLines->matches_exception(New) != NULL);
+       New->exempt = (Instance->XLines->MatchesLine("E",New) != NULL);
        if (!New->exempt)
        {
-               ZLine* r = Instance->XLines->matches_zline(ipaddr);
+               XLine* r = Instance->XLines->MatchesLine("Z",New);
+
                if (r)
                {
                        char reason[MAXBUF];
@@ -912,13 +913,8 @@ void User::CheckClass()
                return;
        }
 
-       this->pingmax = a->GetPingTime();
        this->nping = ServerInstance->Time() + a->GetPingTime() + ServerInstance->Config->dns_timeout;
        this->timeout = ServerInstance->Time() + a->GetRegTimeout();
-       this->flood = a->GetFlood();
-       this->threshold = a->GetThreshold();
-       this->sendqmax = a->GetSendqMax();
-       this->recvqmax = a->GetRecvqMax();
        this->MaxChans = a->GetMaxChans();
 }
 
@@ -938,15 +934,15 @@ void User::FullConnect()
        /* Check the password, if one is required by the user's connect class.
         * This CANNOT be in CheckClass(), because that is called prior to PASS as well!
         */
-       if ((!this->MyClass->GetPass().empty()) && (!this->haspassed))
+       if (this->MyClass && !this->MyClass->GetPass().empty() && !this->haspassed)
        {
                User::QuitUser(ServerInstance, this, "Invalid password");
                return;
        }
-       
+
        if (!this->exempt)
        {
-               GLine* r = ServerInstance->XLines->matches_gline(this);
+               XLine* r = ServerInstance->XLines->MatchesLine("G",this);
 
                if (r)
                {
@@ -959,7 +955,7 @@ void User::FullConnect()
                        return;
                }
 
-               KLine* n = ServerInstance->XLines->matches_kline(this);
+               XLine* n = ServerInstance->XLines->MatchesLine("K",this);
 
                if (n)
                {
@@ -1069,7 +1065,7 @@ bool User::ForceNickChange(const char* newnick)
                        return false;
                }
 
-               if (ServerInstance->XLines->matches_qline(newnick))
+               if (ServerInstance->XLines->MatchesLine("Q",newnick))
                {
                        ServerInstance->stats->statsCollisions++;
                        return false;
@@ -1721,19 +1717,20 @@ unsigned int User::GetMaxChans()
  */
 ConnectClass* User::SetClass(const std::string &explicit_name)
 {
-       if (this->MyClass)
-       {
-               ServerInstance->Log(DEBUG, "Untying user from connect class -- refcount: %u", this->MyClass->RefCount);
-               this->MyClass->RefCount--;
-       }
+       ConnectClass *found = NULL;
+
+       if (!IS_LOCAL(this))
+               return NULL;
 
        if (!explicit_name.empty())
        {
                for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
                {
-                       if (explicit_name == i->GetName())
+                       ConnectClass* c = *i;
+
+                       if (explicit_name == c->GetName() && !c->GetDisabled())
                        {
-                               this->MyClass = &(*i);
+                               found = c;
                        }
                }
        }
@@ -1741,28 +1738,52 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
        {
                for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
                {
-                       if (((match(this->GetIPString(),i->GetHost().c_str(),true)) || (match(this->host,i->GetHost().c_str()))))
+                       ConnectClass* c = *i;
+
+                       if (((match(this->GetIPString(),c->GetHost().c_str(),true)) || (match(this->host,c->GetHost().c_str()))))
                        {
-                               if (i->GetPort())
+                               if (c->GetPort())
                                {
-                                       if (this->GetPort() == i->GetPort())
+                                       if (this->GetPort() == c->GetPort() && !c->GetDisabled())
                                        {
-                                               this->MyClass = &(*i);
+                                               found = c;
                                        }
                                        else
                                                continue;
                                }
                                else
                                {
-                                       this->MyClass = &(*i);
+                                       if (!c->GetDisabled())
+                                               found = c;
                                }
                        }
                }
        }
 
-       this->MyClass->RefCount++;
-       ServerInstance->Log(DEBUG, "User tied to class -- connect refcount now: %u", this->MyClass->RefCount);
-       /* will only happen for remote users. */
+       /* ensure we don't fuck things up refcount wise, only remove them from a class if we find a new one :P */
+       if (found)
+       {
+               /* deny change if change will take class over the limit */
+               if (found->limit && (found->RefCount + 1 >= found->limit))
+               {
+                       ServerInstance->Log(DEBUG, "OOPS: Connect class limit (%u) hit, denying", found->limit);
+                       return this->MyClass;
+               }
+
+               /* should always be valid, but just in case .. */
+               if (this->MyClass)
+               {
+                       if (found == this->MyClass) // no point changing this shit :P
+                               return this->MyClass;
+                       this->MyClass->RefCount--;
+                       ServerInstance->Log(DEBUG, "Untying user from connect class -- refcount: %u", this->MyClass->RefCount);
+               }
+
+               this->MyClass = found;
+               this->MyClass->RefCount++;
+               ServerInstance->Log(DEBUG, "User tied to new class -- connect refcount now: %u", this->MyClass->RefCount);
+       }
+
        return this->MyClass;
 }