summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-07-11 21:26:27 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-07-11 21:26:27 +0000
commitbd2782b9e80f10f91810fcc819bd6d77f1c991a0 (patch)
tree2365715d79049aaa38b7d5c320951182a88995f8 /src
parent0b070b52bc8e8ceb52388e45cea90f4add119c4f (diff)
Add OnCheckExtBan, will be used for exceptions to extbans
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9957 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/channels.cpp36
1 files changed, 21 insertions, 15 deletions
diff --git a/src/channels.cpp b/src/channels.cpp
index 47dfd91b6..d917edb84 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -453,26 +453,32 @@ bool Channel::IsBanned(User* user)
bool Channel::IsExtBanned(User *user, char type)
{
- // XXX. do we need events?
char mask[MAXBUF];
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnCheckExtBan,OnCheckExtBan(user, this, type));
- 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 (MOD_RESULT == -1)
+ return true;
+ else if (MOD_RESULT == 0)
{
- if (i->data[0] != type || i->data[1] != ':')
- continue;
-
- // Iterate past char and : to get to the mask without doing a data copy(!)
- std::string maskptr = i->data.substr(2);
+ snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
- /* 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)))
+ for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
{
- return true;
+ if (i->data[0] != type || i->data[1] != ':')
+ continue;
+
+ // Iterate past char and : to get to the mask without doing a data copy(!)
+ std::string maskptr = i->data.substr(2);
+
+ /* 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;
+ }
}
}