X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=db23d5672219799857e99d67e84cdc1d7d6fff4c;hb=9d58c0986bfc4801a8d6388947f100317470bb5f;hp=fd99f12b74df329ec5493d1dc5a25fd36dbe77d8;hpb=9e59e5e906246e928b0d90bc8ff25583b0b71a8f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index fd99f12b7..db23d5672 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -1695,6 +1695,8 @@ 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++)
@@ -1706,6 +1708,7 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 
 			if (explicit_name == c->GetName())
 			{
+				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Explicitly set to %s", explicit_name.c_str());
 				found = c;
 			}
 		}
@@ -1716,9 +1719,26 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 		{
 			ConnectClass* c = *i;
 
+			if (c->GetType() == CC_ALLOW)
+			{
+				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().c_str(),true)) && (!match(this->host,c->GetHost().c_str()))))
+			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;
 			}
 
@@ -1728,26 +1748,26 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 			 */
 			if (c->limit && (c->RefCount + 1 >= c->limit))
 			{
-				ServerInstance->Logs->Log("USERS", DEBUG, "OOPS: Connect class limit (%lu) hit, denying", c->limit);
+				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "OOPS: Connect class limit (%lu) hit, denying", c->limit);
 				continue;
 			}
 
-			/* if it's disabled, we can't match this one. */
-			if (c->GetDisabled())
-				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())
 				{
+					ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Port match failed (%d)", this->GetPort());
 					continue;
 				}
 			}
 
-			/* we match this class, BUT! we must keep checking in case a further class is type deny and also matches us. */
+			/* we stop at the first class that meets ALL critera. */
 			found = c;
+			break;
 		}
 	}