pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-03 19:43:12 +02:00
Code Activity

Merge branch '1.9' of ssh://anope.git.sourceforge.net/gitroot/anope/anope into 1.9

Browse Source
This commit is contained in:
DukePyrolator
2010-12-23 07:15:32 +01:00
parent 184e7b3f64 265006b691
commit a0ad3c4fef
8 changed files with 24 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/extern.h
-1
View File
@@ -352,7 +352,6 @@ E void do_kill(User *user, const Anope::string &reason);
E bool is_excepted(ChannelInfo *ci, User *user);
E bool is_excepted_mask(ChannelInfo *ci, const Anope::string &mask);
E bool match_usermask(const Anope::string &mask, User *user);
E Anope::string create_mask(User *u);
/******************************************************************************/
include/operserv.h
+2
View File
@@ -142,11 +142,13 @@ class CoreExport XLineManager
*/
virtual XLine *Add(BotInfo *bi, User *u, const Anope::string &mask, time_t expires, const Anope::string &reason);
private:
/** Delete an XLine, eg, remove it from the IRCd.
* @param x The xline
*/
virtual void Del(XLine *x);
public:
/** Checks if a mask can/should be added to the XLineManager
* @param mask The mask
* @param expires When the mask would expire
modules/core/cs_akick.cpp
+3 -1
View File
@@ -220,7 +220,9 @@ class CommandCSAKick : public Command
ChanAccess *u2_access = ci->GetAccess(nc), *u_access = ci->GetAccess(u);
int16 u2_level = u2_access ? u2_access->level : 0, u_level = u_access ? u_access->level : 0;
if ((check_access(u2, ci, CA_FOUNDER) || u2_level >= u_level) && match_usermask(mask, u2))
Entry entry_mask(mask);
if ((check_access(u2, ci, CA_FOUNDER) || u2_level >= u_level) && entry_mask.Matches(u2))
{
source.Reply(ACCESS_DENIED);
return;
modules/core/os_sqline.cpp
+2 -5
View File
@@ -170,12 +170,9 @@ class CommandOSSQLine : public Command
reason += " " + params[3];
if (!mask.empty() && !reason.empty())
{
User *user = finduser(mask);
if (user)
mask = "*@" + user->host;
unsigned int affected = 0;
for (patricia_tree<User *>::const_iterator it = UserListByNick.begin(), it_end = UserListByNick.end(); it != it_end; ++it)
if (Anope::Match((*it)->GetIdent() + "@" + (*it)->host, mask))
if (Anope::Match((*it)->nick, mask))
++affected;
float percent = static_cast<float>(affected) / static_cast<float>(UserListByNick.size()) * 100.0;
@@ -370,7 +367,7 @@ class CommandOSSQLine : public Command
{
User *u = source.u;
FOREACH_MOD(I_OnDelXLine, OnDelXLine(u, NULL, X_SQLINE));
SGLine->Clear();
SQLine->Clear();
source.Reply(OPER_SQLINE_CLEAR);
return MOD_CONT;
src/operserv.cpp
+4 -1
View File
@@ -297,6 +297,8 @@ bool XLineManager::DelXLine(XLine *x)
if (it != this->XLines.end())
{
this->Del(x);
delete x;
this->XLines.erase(it);
@@ -427,7 +429,8 @@ XLine *XLineManager::Check(User *u)
if (x->Expires && x->Expires < Anope::CurTime)
{
OnExpire(x);
this->OnExpire(x);
this->Del(x);
delete x;
this->XLines.erase(XLines.begin() + i - 1);
continue;
src/process.cpp
+4 -1
View File
@@ -104,8 +104,11 @@ IgnoreData *get_ignore(const Anope::string &nick)
if (u->HasMode(UMODE_OPER))
return NULL;
for (; ign != ign_end; ++ign)
if (match_usermask((*ign)->mask, u))
{
Entry ignore_mask((*ign)->mask);
if (ignore_mask.Matches(u))
break;
}
}
else
{
src/regchannel.cpp
+9 -2
View File
@@ -748,7 +748,15 @@ bool ChannelInfo::CheckKick(User *user)
{
AutoKick *autokick = this->GetAkick(j);
if ((autokick->HasFlag(AK_ISNICK) && autokick->nc == nc) || (!autokick->HasFlag(AK_ISNICK) && match_usermask(autokick->mask, user)))
if (autokick->HasFlag(AK_ISNICK) && autokick->nc == nc)
do_kick = true;
else
{
Entry akick_mask(autokick->mask);
if (akick_mask.Matches(user))
do_kick = true;
}
if (do_kick)
{
Log(LOG_DEBUG_2) << user->nick << " matched akick " << (autokick->HasFlag(AK_ISNICK) ? autokick->nc->display : autokick->mask);
autokick->last_used = Anope::CurTime;
@@ -757,7 +765,6 @@ bool ChannelInfo::CheckKick(User *user)
else
mask = autokick->mask;
reason = autokick->reason.empty() ? Config->CSAutokickReason : autokick->reason;
do_kick = true;
break;
}
}
src/users.cpp
-30
View File
@@ -914,36 +914,6 @@ bool is_excepted_mask(ChannelInfo *ci, const Anope::string &mask)
/*************************************************************************/
/* Does the user's usermask match the given mask (either nick!user@host or
* just user@host)?
*/
bool match_usermask(const Anope::string &mask, User *user)
{
if (mask.empty())
return false;
Anope::string mask2 = mask, nick, username, host;
size_t ex = mask2.find('!');
if (ex != Anope::string::npos)
{
nick = mask2.substr(0, ex);
mask2 = mask2.substr(ex + 1);
}
size_t at = mask2.find('@');
if (at != Anope::string::npos)
{
username = mask2.substr(0, at);
host = mask2.substr(at + 1);
}
if (username.empty() || host.empty())
return 0;
return (nick.empty() ? true : Anope::Match(user->nick, nick)) && Anope::Match(user->GetIdent(), username) && (Anope::Match(user->host, host) || Anope::Match(user->GetDisplayedHost(), host));
}
/*************************************************************************/
/* Given a user, return a mask that will most likely match any address the
* user will have from that location. For IP addresses, wildcards the
* appropriate subnet mask (e.g. 35.1.1.1 -> 35.*; 128.2.1.1 -> 128.2.*);