* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
(*(ServerInstance->chanlist))[cname.c_str()] = this;
this->name.assign(cname, 0, ServerInstance->Config->Limits.ChanMax);
- this->created = ts ? ts : ServerInstance->Time();
- this->age = this->created;
+ this->age = ts ? ts : ServerInstance->Time();
maxbans = topicset = 0;
modes.reset();
/* 0: check status, 1: don't, -1: disallow change silently */
FOREACH_RESULT(I_OnLocalTopicChange,OnLocalTopicChange(u,this,ntopic));
-
+
if (MOD_RESULT == 1)
return CMD_FAILURE;
else if (MOD_RESULT == 0)
}
else
{
- if (IS_OPER(user))
+ if (user->HasPrivPermission("channels/high-join-limit"))
{
if (user->chans.size() >= Instance->Config->OperMaxChans)
{
strlcpy(cname, cn, Instance->Config->Limits.ChanMax);
Ptr = Instance->FindChan(cname);
+ bool created_by_local = false;
if (!Ptr)
{
else
{
privs = "@";
+ created_by_local = true;
}
if (IS_LOCAL(user) && override == false)
}
}
- /* As spotted by jilles, dont bother to set this on remote users */
- if (IS_LOCAL(user) && Ptr->GetUserCounter() == 0)
+ if (created_by_local)
+ {
+ /* As spotted by jilles, dont bother to set this on remote users */
Ptr->SetDefaultModes();
+ }
return Channel::ForceChan(Instance, Ptr, user, privs, bursting);
}
Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting)
-{
+{
std::string nick = user->nick;
bool silent = false;
bool Channel::IsBanned(User* user)
{
- char mask[MAXBUF];
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, this));
+ int result = 0;
+ FOREACH_RESULT_MAP(I_OnCheckBan, OnCheckBan(user, this),
+ result = banmatch_reduce(result, MOD_RESULT);
+ );
- if (MOD_RESULT == -1)
- return true;
- else if (MOD_RESULT == 0)
+ if (result)
+ return (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++)
{
- 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 ((InspIRCd::Match(user->GetFullHost(),i->data, NULL)) || // host
+ (InspIRCd::Match(user->GetFullRealHost(),i->data, NULL)) || // uncloaked host
+ (InspIRCd::MatchCIDR(mask, i->data, NULL))) // ip
{
- if ((InspIRCd::Match(user->GetFullHost(),i->data, NULL)) || // host
- (InspIRCd::Match(user->GetFullRealHost(),i->data, NULL)) || // uncloaked host
- (InspIRCd::MatchCIDR(mask, i->data, NULL))) // ip
- {
- return true;
- }
+ return true;
}
}
return false;
}
-bool Channel::IsExtBanned(const std::string &str, char type)
+int Channel::GetExtBanStatus(const std::string &str, char type)
{
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnCheckStringExtBan, OnCheckStringExtBan(str, this, type));
+ int result = 0;
+ FOREACH_RESULT_MAP(I_OnCheckStringExtBan, OnCheckStringExtBan(str, this, type),
+ result = banmatch_reduce(result, MOD_RESULT);
+ );
- if (MOD_RESULT == -1)
- return true;
- else if (MOD_RESULT == 0)
+ if (result)
+ return result;
+
+ // nobody decided for us, check the ban list
+ for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
{
- for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
- {
- if (i->data[0] != type || i->data[1] != ':')
- continue;
+ 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);
- ServerInstance->Logs->Log("EXTBANS", DEBUG, "Checking %s against %s, type is %c", str.c_str(), maskptr.c_str(), type);
+ std::string maskptr = i->data.substr(2);
+ ServerInstance->Logs->Log("EXTBANS", DEBUG, "Checking %s against %s, type is %c", str.c_str(), maskptr.c_str(), type);
- if (InspIRCd::Match(str, maskptr, NULL))
- return true;
- }
+ if (InspIRCd::Match(str, maskptr, NULL))
+ return -1;
}
- return false;
+ return 0;
}
-bool Channel::IsExtBanned(User *user, char type)
+int Channel::GetExtBanStatus(User *user, char type)
{
- int MOD_RESULT = 0;
- 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());
-
- // XXX: we should probably hook cloaked hosts in here somehow too..
- if (this->IsExtBanned(mask, type))
- return true;
+ int result = 0;
+ FOREACH_RESULT_MAP(I_OnCheckExtBan, OnCheckExtBan(user, this, type),
+ result = banmatch_reduce(result, MOD_RESULT);
+ );
- if (this->IsExtBanned(user->GetFullHost(), type))
- return true;
-
- if (this->IsExtBanned(user->GetFullRealHost(), type))
- return true;
- }
+ if (result)
+ return result;
- return false;
+ char mask[MAXBUF];
+ int rv = 0;
+ snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
+
+ // XXX: we should probably hook cloaked hosts in here somehow too..
+ rv = banmatch_reduce(rv, this->GetExtBanStatus(mask, type));
+ rv = banmatch_reduce(rv, this->GetExtBanStatus(user->GetFullHost(), type));
+ rv = banmatch_reduce(rv, this->GetExtBanStatus(user->GetFullRealHost(), type));
+ return rv;
}
/* Channel::PartUser
* remove a channel from a users record, and return the number of users left.
* Therefore, if this function returns 0 the caller should delete the Channel.
- *
- * XXX: bleh, string copy of reason, fixme! -- w00t
*/
long Channel::PartUser(User *user, std::string &reason)
{
prefixes.erase(n);
}
}
-
projects / user / henk / code / inspircd.git / blobdiff