This conflicted a few hours ago apparantly (????)

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

diff --git a/src/users.cpp b/src/users.cpp
index ab42708456a882ebf018dd179ac151eec2a5790f..db23d5672219799857e99d67e84cdc1d7d6fff4c 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -533,14 +533,11 @@ bool User::AddBuffer(const std::string &a)
        }
        else
        {
-               ServerInstance->Logs->Log("recvqdebug", DEBUG, "Current recvq size is %d and I got called with a string of %d\n(%s)", recvq.length(), a.length(), a.c_str());
-
                // While we can find the end of a chunk to add
                while (i != std::string::npos)
                {
                        // Append the chunk that we have
                        recvq.append(a, start, (i - start));
-                       ServerInstance->Logs->Log("recvqdebug", DEBUG, "Appended a chunk, length is now %d", recvq.length());
 
                        // Start looking for the next one
                        start = i + 1;
@@ -560,11 +557,8 @@ bool User::AddBuffer(const std::string &a)
                         * which is most *certainly* not the behaviour we want!
                         *              -- w00t
                         */
-                       ServerInstance->Logs->Log("recvqdebug", DEBUG, "*** ALERT *** start != a.length, we should probably add more");
                        recvq.append(a, start, (a.length() - start));
                }
-
-               ServerInstance->Logs->Log("recvqdebug", DEBUG, "Final recvq length is %d\n(%s)", recvq.length(), recvq.c_str());
        }
 
        if (this->MyClass && (recvq.length() > this->MyClass->GetRecvqMax()))
@@ -1701,14 +1695,20 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
        if (!IS_LOCAL(this))
                return NULL;
 
+       ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Setting connect class for UID %s", this->uuid);
+
        if (!explicit_name.empty())
        {
                for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
                {
                        ConnectClass* c = *i;
 
-                       if (explicit_name == c->GetName() && !c->GetDisabled())
+                       if (c->GetDisabled())
+                               continue; // can't possibly match, removed from conf
+
+                       if (explicit_name == c->GetName())
                        {
+                               ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Explicitly set to %s", explicit_name.c_str());
                                found = c;
                        }
                }
@@ -1719,37 +1719,64 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
                {
                        ConnectClass* c = *i;
 
-                       if (((match(this->GetIPString(),c->GetHost().c_str(),true)) || (match(this->host,c->GetHost().c_str()))))
+                       if (c->GetType() == CC_ALLOW)
                        {
-                               if (c->GetPort())
-                               {
-                                       if (this->GetPort() == c->GetPort() && !c->GetDisabled())
-                                       {
-                                               found = c;
-                                       }
-                                       else
-                                               continue;
-                               }
-                               else
+                               ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "ALLOW %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str());
+                       }
+                       else
+                       {
+                               ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "DENY %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str());
+                       }
+
+                       /* if it's disabled, we can't match this one. */
+                       if (c->GetDisabled())
+                       {
+                               ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Class disabled");
+                               continue;
+                       }
+
+                       /* check if host matches.. */
+                       if (((!match(this->GetIPString(),c->GetHost(),true)) && (!match(this->host,c->GetHost()))))
+                       {
+                               ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "No host match (for %s)", c->GetHost().c_str());
+                               continue;
+                       }
+
+                       /*
+                        * deny change if change will take class over the limit check it HERE, not after we found a matching class,
+                        * because we should attempt to find another class if this one doesn't match us. -- w00t
+                        */
+                       if (c->limit && (c->RefCount + 1 >= c->limit))
+                       {
+                               ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "OOPS: Connect class limit (%lu) hit, denying", c->limit);
+                               continue;
+                       }
+
+                       /* if it requires a port ... */
+                       if (c->GetPort())
+                       {
+                               ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Requires port (%d)", c->GetPort());
+
+                               /* and our port doesn't match, fail. */
+                               if (this->GetPort() != c->GetPort())
                                {
-                                       if (!c->GetDisabled())
-                                               found = c;
+                                       ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Port match failed (%d)", this->GetPort());
+                                       continue;
                                }
                        }
+
+                       /* we stop at the first class that meets ALL critera. */
+                       found = c;
+                       break;
                }
        }
 
-       /* ensure we don't fuck things up refcount wise, only remove them from a class if we find a new one :P */
+       /*
+        * Okay, assuming we found a class that matches.. switch us into that class, keeping refcounts up to date.
+        */
        if (found)
        {
-               /* deny change if change will take class over the limit */
-               if (found->limit && (found->RefCount + 1 >= found->limit))
-               {
-                       ServerInstance->Logs->Log("USERS", DEBUG, "OOPS: Connect class limit (%lu) hit, denying", found->limit);
-                       return this->MyClass;
-               }
-
-               /* should always be valid, but just in case .. */
+               /* only fiddle with refcounts if they are already in a class .. */
                if (this->MyClass)
                {
                        if (found == this->MyClass) // no point changing this shit :P