Okay, and there's the working version of it. Extbans that don't work on users have OnCheckStringExtBan. ;p

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9988 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 17 insertions, 26 deletions

diff --git a/src/channels.cpp b/src/channels.cpp
index 7fd1036d2..e9d7f4a27 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -453,14 +453,13 @@ bool Channel::IsBanned(User* user)
 
 bool Channel::IsExtBanned(const std::string &str, char type)
 {
-// XXX XXX XXX need to figure out how to get this to work with string types...
-//	int MOD_RESULT = 0;
-//	FOREACH_RESULT(I_OnCheckExtBan,OnCheckExtBan(user, this, type));
-
-//	if (MOD_RESULT == -1)
-//		return true;
-//	else if (MOD_RESULT == 0)
-//	{
+	int MOD_RESULT = 0;
+	FOREACH_RESULT(I_OnCheckStringExtBan, OnCheckStringExtBan(str, this, type));
+
+	if (MOD_RESULT == -1)
+		return true;
+	else if (MOD_RESULT == 0)
+	{
 		for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
 		{
 			if (i->data[0] != type || i->data[1] != ':')
@@ -472,40 +471,32 @@ bool Channel::IsExtBanned(const std::string &str, char type)
 			if (match(str, maskptr))
 				return true;
 		}
-//	}
+	}
 
 	return false;
 }
 
 bool Channel::IsExtBanned(User *user, char type)
 {
-	char mask[MAXBUF];
 	int MOD_RESULT = 0;
-	FOREACH_RESULT(I_OnCheckExtBan,OnCheckExtBan(user, this, type));
+	FOREACH_RESULT(I_OnCheckExtBan, OnCheckExtBan(user, this, type));
 
 	if (MOD_RESULT == -1)
 		return true;
 	else if (MOD_RESULT == 0)
 	{
+		char mask[MAXBUF];
 		snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
 
-		for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
-		{
-			if (i->data[0] != type || i->data[1] != ':')
-				continue;
+		// XXX: we should probably hook cloaked hosts in here somehow too..
+		if (this->IsExtBanned(mask, type))
+			return true;
 
-			// Iterate past char and : to get to the mask without doing a data copy(!)
-			std::string maskptr = i->data.substr(2);
+		if (this->IsExtBanned(user->GetFullHost(), type))
+			return true;
 
-			/* This allows CIDR ban matching
-			 *
-			 *        Full masked host                             Full unmasked host                     IP with/without CIDR
-		 	*/
-			if ((match(user->GetFullHost(), maskptr)) || (match(user->GetFullRealHost(), maskptr)) || (match(mask, maskptr, true)))
-			{
-				return true;
-			}
-		}
+		if (this->IsExtBanned(user->GetFullRealHost(), type))
+			return true;
 	}
 
 	return false;