This won't work yet.

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

diff --git a/src/users.cpp b/src/users.cpp
index 0e08a88481601910f98b7a3ddaa70e36222971e0..3803a7a9efebeeeea00e209f689b558dd0e71ab3 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -495,7 +495,7 @@ bool User::AddBuffer(std::string a)
                if (a.length())
                        recvq.append(a);
 
-               if (recvq.length() > (unsigned)this->MyClass->GetRecvqMax())
+               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());
@@ -567,7 +567,7 @@ void User::AddWriteBuf(const std::string &data)
        if (*this->GetWriteError())
                return;
 
-       if (sendq.length() + data.length() > (unsigned)this->MyClass->GetSendqMax())
+       if (this->MyClass && (sendq.length() + data.length() > this->MyClass->GetSendqMax()))
        {
                /*
                 * Fix by brain - Set the error text BEFORE calling writeopers, because
@@ -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];
@@ -933,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)
                {
@@ -954,7 +955,7 @@ void User::FullConnect()
                        return;
                }
 
-               KLine* n = ServerInstance->XLines->matches_kline(this);
+               XLine* n = ServerInstance->XLines->MatchesLine("K",this);
 
                if (n)
                {
@@ -1064,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;
@@ -1725,9 +1726,11 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
        {
                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())
                        {
-                               found = &(*i);
+                               found = c;
                        }
                }
        }
@@ -1735,20 +1738,23 @@ 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())
                                        {
-                                               found = &(*i);
+                                               found = c;
                                        }
                                        else
                                                continue;
                                }
                                else
                                {
-                                       found = &(*i);
+                                       if (!c->GetDisabled())
+                                               found = c;
                                }
                        }
                }
@@ -1757,9 +1763,18 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
        /* 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);
                }