* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
* ---------------------------------------------------
*/
-/* $Core: libIRCDchannels */
+/* $Core */
#include "inspircd.h"
-#include <stdarg.h>
-#include "wildcard.h"
+#include <cstdarg>
#include "mode.h"
-Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts) : ServerInstance(Instance)
+Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts)
{
chan_hash::iterator findchan = ServerInstance->chanlist->find(cname);
if (findchan != Instance->chanlist->end())
throw CoreException("Cannot create duplicate channel " + cname);
(*(ServerInstance->chanlist))[cname.c_str()] = this;
- strlcpy(this->name, cname.c_str(), CHANMAX);
- this->created = ts ? ts : ServerInstance->Time();
- this->age = this->created;
+ this->name.assign(cname, 0, ServerInstance->Config->Limits.ChanMax);
+ this->age = ts ? ts : ServerInstance->Time();
-
-
-
- *topic = *setby = *key = 0;
- maxbans = topicset = limit = 0;
- memset(&modes,0,64);
+ maxbans = topicset = 0;
+ modes.reset();
}
void Channel::SetMode(char mode,bool mode_on)
{
modes[mode-65] = mode_on;
- if (!mode_on)
- this->SetModeParam(mode,"",false);
}
-
-void Channel::SetModeParam(char mode,const char* parameter,bool mode_on)
+void Channel::SetModeParam(char mode, std::string parameter)
{
- CustomModeList::iterator n = custom_mode_params.find(mode);
-
- if (mode_on)
+ CustomModeList::iterator n = custom_mode_params.find(mode);
+ // always erase, even if changing, so that the map gets the new value
+ if (n != custom_mode_params.end())
+ custom_mode_params.erase(n);
+ if (parameter.empty())
{
- if (n == custom_mode_params.end())
- custom_mode_params[mode] = strdup(parameter);
+ modes[mode-65] = false;
}
else
{
- if (n != custom_mode_params.end())
- {
- free(n->second);
- custom_mode_params.erase(n);
- }
+ custom_mode_params[mode] = parameter;
+ modes[mode-65] = true;
}
}
-bool Channel::IsModeSet(char mode)
+std::string Channel::GetModeParameter(char mode)
{
- return modes[mode-65];
+ CustomModeList::iterator n = custom_mode_params.find(mode);
+ if (n != custom_mode_params.end())
+ return n->second;
+ return "";
}
-std::string Channel::GetModeParameter(char mode)
+int Channel::SetTopic(User *u, std::string &ntopic, bool forceset)
{
- switch (mode)
+ if (u)
{
- case 'k':
- return this->key;
- case 'l':
- return ConvToStr(this->limit);
- default:
- CustomModeList::iterator n = custom_mode_params.find(mode);
- if (n != custom_mode_params.end())
- return n->second;
- return "";
- break;
- }
-}
+ if(!forceset)
+ {
+ ModResult res;
+ /* 0: check status, 1: don't, -1: disallow change silently */
-long Channel::GetUserCounter()
-{
- return (this->internal_userlist.size());
-}
+ FIRST_MOD_RESULT(ServerInstance, OnPreTopicChange, res, (u,this,ntopic));
-void Channel::AddUser(User* user)
-{
- internal_userlist[user] = user->nick;
-}
+ if (res == MOD_RES_DENY)
+ return CMD_FAILURE;
+ if (res != MOD_RES_ALLOW)
+ {
+ if (!this->HasUser(u))
+ {
+ u->WriteNumeric(442, "%s %s :You're not on that channel!",u->nick.c_str(), this->name.c_str());
+ return CMD_FAILURE;
+ }
+ if ((this->IsModeSet('t')) && (this->GetPrefixValue(u) < HALFOP_VALUE))
+ {
+ u->WriteNumeric(482, "%s %s :You must be at least a half-operator to change the topic on this channel", u->nick.c_str(), this->name.c_str());
+ return CMD_FAILURE;
+ }
+ }
+ }
+ }
-unsigned long Channel::DelUser(User* user)
-{
- CUListIter a = internal_userlist.find(user);
-
- if (a != internal_userlist.end())
+ this->topic.assign(ntopic, 0, ServerInstance->Config->Limits.MaxTopic);
+ if (u)
{
- internal_userlist.erase(a);
- /* And tidy any others... */
- DelOppedUser(user);
- DelHalfoppedUser(user);
- DelVoicedUser(user);
+ this->setby.assign(ServerInstance->Config->FullHostInTopic ? u->GetFullHost() : u->nick, 0, 128);
+ this->WriteChannel(u, "TOPIC %s :%s", this->name.c_str(), this->topic.c_str());
+ }
+ else
+ {
+ this->setby.assign(ServerInstance->Config->ServerName);
+ this->WriteChannelWithServ(ServerInstance->Config->ServerName, "TOPIC %s :%s", this->name.c_str(), this->topic.c_str());
}
-
- return internal_userlist.size();
-}
-
-bool Channel::HasUser(User* user)
-{
- return (internal_userlist.find(user) != internal_userlist.end());
-}
-void Channel::AddOppedUser(User* user)
-{
- internal_op_userlist[user] = user->nick;
-}
+ this->topicset = ServerInstance->Time();
-void Channel::DelOppedUser(User* user)
-{
- CUListIter a = internal_op_userlist.find(user);
- if (a != internal_op_userlist.end())
+ // XXX: this check for 'u' is probably pre-fake-user, and it fucking sucks anyway. we need to change this.
+ if (u)
{
- internal_op_userlist.erase(a);
- return;
+ FOREACH_MOD(I_OnPostTopicChange,OnPostTopicChange(u, this, this->topic));
}
-}
-void Channel::AddHalfoppedUser(User* user)
-{
- internal_halfop_userlist[user] = user->nick;
+ return CMD_SUCCESS;
}
-void Channel::DelHalfoppedUser(User* user)
+long Channel::GetUserCounter()
{
- CUListIter a = internal_halfop_userlist.find(user);
-
- if (a != internal_halfop_userlist.end())
- {
- internal_halfop_userlist.erase(a);
- }
+ return userlist.size();
}
-void Channel::AddVoicedUser(User* user)
+Membership* Channel::AddUser(User* user)
{
- internal_voice_userlist[user] = user->nick;
+ Membership* memb = new Membership(user, this);
+ userlist[user] = memb;
+ return memb;
}
-void Channel::DelVoicedUser(User* user)
+unsigned long Channel::DelUser(User* user)
{
- CUListIter a = internal_voice_userlist.find(user);
-
- if (a != internal_voice_userlist.end())
+ UserMembIter a = userlist.find(user);
+
+ if (a != userlist.end())
{
- internal_voice_userlist.erase(a);
+ delete a->second;
+ userlist.erase(a);
}
-}
-CUList* Channel::GetUsers()
-{
- return &internal_userlist;
+ return userlist.size();
}
-CUList* Channel::GetOppedUsers()
+bool Channel::HasUser(User* user)
{
- return &internal_op_userlist;
+ return (userlist.find(user) != userlist.end());
}
-CUList* Channel::GetHalfoppedUsers()
+Membership* Channel::GetUser(User* user)
{
- return &internal_halfop_userlist;
+ UserMembIter i = userlist.find(user);
+ if (i == userlist.end())
+ return NULL;
+ return i->second;
}
-CUList* Channel::GetVoicedUsers()
+const UserMembList* Channel::GetUsers()
{
- return &internal_voice_userlist;
+ return &userlist;
}
void Channel::SetDefaultModes()
}
}
-/*
+/*
* add a channel to a user, creating the record for it if needed and linking
- * it to the user record
+ * it to the user record
*/
Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool override, const char* key, bool bursting, time_t TS)
{
- if (!user || !cn)
+ // Fix: unregistered users could be joined using /SAJOIN
+ if (!user || !cn || user->registered != REG_ALL)
return NULL;
char cname[MAXBUF];
- int MOD_RESULT = 0;
std::string privs;
Channel *Ptr;
*/
if (IS_LOCAL(user) && !override)
{
- if (user->GetMaxChans())
- {
- if (user->chans.size() >= user->GetMaxChans())
- {
- user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick, cn);
- return NULL;
- }
- }
- else
+ // Checking MyClass exists because we *may* get here with NULL, not 100% sure.
+ if (user->MyClass && user->MyClass->maxchans)
{
- if (IS_OPER(user))
+ if (user->HasPrivPermission("channels/high-join-limit"))
{
if (user->chans.size() >= Instance->Config->OperMaxChans)
{
- user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick, cn);
+ user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn);
return NULL;
}
}
else
{
- if (user->chans.size() >= Instance->Config->MaxChans)
+ if (user->chans.size() >= user->MyClass->maxchans)
{
- user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick, cn);
+ user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn);
return NULL;
}
}
}
}
- strlcpy(cname, cn, CHANMAX);
+ strlcpy(cname, cn, Instance->Config->Limits.ChanMax);
Ptr = Instance->FindChan(cname);
+ bool created_by_local = false;
if (!Ptr)
{
if (!IS_LOCAL(user))
{
if (!TS)
- Instance->Logs->Log("CHANNEL",DEBUG,"*** BUG *** Channel::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick, cn);
+ Instance->Logs->Log("CHANNEL",DEBUG,"*** BUG *** Channel::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick.c_str(), cn);
}
else
{
- privs = "@";
+ privs = "o";
+ created_by_local = true;
}
if (IS_LOCAL(user) && override == false)
{
- MOD_RESULT = 0;
- FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname,privs));
- if (MOD_RESULT == 1)
+ ModResult MOD_RESULT;
+ FIRST_MOD_RESULT(Instance, OnUserPreJoin, MOD_RESULT, (user, NULL, cname, privs, key ? key : ""));
+ if (MOD_RESULT == MOD_RES_DENY)
return NULL;
}
*/
if (IS_LOCAL(user) && override == false)
{
- MOD_RESULT = 0;
- FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname,privs));
- if (MOD_RESULT == 1)
+ ModResult MOD_RESULT;
+ FIRST_MOD_RESULT(Instance, OnUserPreJoin, MOD_RESULT, (user, Ptr, cname, privs, key ? key : ""));
+ if (MOD_RESULT == MOD_RES_DENY)
{
return NULL;
}
- else if (MOD_RESULT == 0)
+ else if (MOD_RESULT == MOD_RES_PASSTHRU)
{
- if (*Ptr->key)
+ std::string ckey = Ptr->GetModeParameter('k');
+ bool invited = user->IsInvited(Ptr->name.c_str());
+ bool can_bypass = Instance->Config->InvBypassModes && invited;
+
+ if (!ckey.empty())
{
- MOD_RESULT = 0;
- FOREACH_RESULT_I(Instance,I_OnCheckKey,OnCheckKey(user, Ptr, key ? key : ""));
- if (!MOD_RESULT)
+ FIRST_MOD_RESULT(Instance, OnCheckKey, MOD_RESULT, (user, Ptr, key ? key : ""));
+ if (!MOD_RESULT.check((key && ckey == key) || can_bypass))
{
- if ((!key) || strcmp(key,Ptr->key))
- {
- user->WriteNumeric(475, "%s %s :Cannot join channel (Incorrect channel key)",user->nick, Ptr->name);
- return NULL;
- }
+ // If no key provided, or key is not the right one, and can't bypass +k (not invited or option not enabled)
+ user->WriteNumeric(ERR_BADCHANNELKEY, "%s %s :Cannot join channel (Incorrect channel key)",user->nick.c_str(), Ptr->name.c_str());
+ return NULL;
}
}
+
if (Ptr->IsModeSet('i'))
{
- MOD_RESULT = 0;
- FOREACH_RESULT_I(Instance,I_OnCheckInvite,OnCheckInvite(user, Ptr));
- if (!MOD_RESULT)
+ FIRST_MOD_RESULT(Instance, OnCheckInvite, MOD_RESULT, (user, Ptr));
+ if (!MOD_RESULT.check(invited))
{
- if (!user->IsInvited(Ptr->name))
- {
- user->WriteNumeric(473, "%s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
- return NULL;
- }
+ user->WriteNumeric(ERR_INVITEONLYCHAN, "%s %s :Cannot join channel (Invite only)",user->nick.c_str(), Ptr->name.c_str());
+ return NULL;
}
- user->RemoveInvite(Ptr->name);
}
- if (Ptr->limit)
+
+ std::string limit = Ptr->GetModeParameter('l');
+ if (!limit.empty())
{
- MOD_RESULT = 0;
- FOREACH_RESULT_I(Instance,I_OnCheckLimit,OnCheckLimit(user, Ptr));
- if (!MOD_RESULT)
+ FIRST_MOD_RESULT(Instance, OnCheckLimit, MOD_RESULT, (user, Ptr));
+ if (!MOD_RESULT.check((Ptr->GetUserCounter() < atol(limit.c_str()) || can_bypass)))
{
- if (Ptr->GetUserCounter() >= Ptr->limit)
- {
- user->WriteNumeric(471, "%s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
- return NULL;
- }
+ user->WriteNumeric(ERR_CHANNELISFULL, "%s %s :Cannot join channel (Channel is full)",user->nick.c_str(), Ptr->name.c_str());
+ return NULL;
}
}
- if (Ptr->bans.size())
+
+ if (Ptr->IsBanned(user) && !can_bypass)
{
- if (Ptr->IsBanned(user))
- {
- user->WriteNumeric(474, "%s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
- return NULL;
- }
+ user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)",user->nick.c_str(), Ptr->name.c_str());
+ return NULL;
+ }
+
+ /*
+ * If the user has invites for this channel, remove them now
+ * after a successful join so they don't build up.
+ */
+ if (invited)
+ {
+ user->RemoveInvite(Ptr->name.c_str());
}
}
}
}
- /* 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);
+ return Channel::ForceChan(Instance, Ptr, user, privs, bursting, created_by_local);
}
-Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting)
+Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting, bool created)
{
std::string nick = user->nick;
- bool silent = false;
- Ptr->AddUser(user);
-
- /* Just in case they have no permissions */
- user->chans[Ptr] = 0;
+ Membership* memb = Ptr->AddUser(user);
+ user->chans.insert(Ptr);
for (std::string::const_iterator x = privs.begin(); x != privs.end(); x++)
{
const char status = *x;
- ModeHandler* mh = Instance->Modes->FindPrefix(status);
+ ModeHandler* mh = Instance->Modes->FindMode(status, MODETYPE_CHANNEL);
if (mh)
{
/* Set, and make sure that the mode handler knows this mode was now set */
- Ptr->SetPrefix(user, status, mh->GetPrefixRank(), true);
+ Ptr->SetPrefix(user, mh->GetModeChar(), true);
mh->OnModeChange(Instance->FakeClient, Instance->FakeClient, Ptr, nick, true);
-
- switch (mh->GetPrefix())
- {
- /* These logic ops are SAFE IN THIS CASE because if the entry doesnt exist,
- * addressing operator[] creates it. If they do exist, it points to it.
- * At all other times where we dont want to create an item if it doesnt exist, we
- * must stick to ::find().
- */
- case '@':
- user->chans[Ptr] |= UCMODE_OP;
- break;
- case '%':
- user->chans[Ptr] |= UCMODE_HOP;
- break;
- case '+':
- user->chans[Ptr] |= UCMODE_VOICE;
- break;
- }
}
}
- FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user, Ptr, bursting, silent));
+ CUList except_list;
+ FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(memb, bursting, created, except_list));
- if (!silent)
- Ptr->WriteChannel(user,"JOIN :%s",Ptr->name);
+ Ptr->WriteAllExcept(user, false, 0, except_list, "JOIN :%s", Ptr->name.c_str());
/* Theyre not the first ones in here, make sure everyone else sees the modes we gave the user */
std::string ms = Instance->Modes->ModeString(user, Ptr);
if ((Ptr->GetUserCounter() > 1) && (ms.length()))
- Ptr->WriteAllExceptSender(user, true, 0, "MODE %s +%s", Ptr->name, ms.c_str());
+ Ptr->WriteAllExceptSender(user, true, 0, "MODE %s +%s", Ptr->name.c_str(), ms.c_str());
/* Major improvement by Brain - we dont need to be calculating all this pointlessly for remote users */
if (IS_LOCAL(user))
{
if (Ptr->topicset)
{
- user->WriteNumeric(332, "%s %s :%s", user->nick, Ptr->name, Ptr->topic);
- user->WriteNumeric(333, "%s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset);
+ user->WriteNumeric(RPL_TOPIC, "%s %s :%s", user->nick.c_str(), Ptr->name.c_str(), Ptr->topic.c_str());
+ user->WriteNumeric(RPL_TOPICTIME, "%s %s %s %lu", user->nick.c_str(), Ptr->name.c_str(), Ptr->setby.c_str(), (unsigned long)Ptr->topicset);
}
Ptr->UserList(user);
}
- FOREACH_MOD_I(Instance,I_OnPostJoin,OnPostJoin(user, Ptr));
+ FOREACH_MOD_I(Instance,I_OnPostJoin,OnPostJoin(memb));
return Ptr;
}
bool Channel::IsBanned(User* user)
{
- char mask[MAXBUF];
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, this));
+ ModResult result;
+ DO_EACH_HOOK(ServerInstance, OnCheckBan, ModResult modresult, (user, this))
+ {
+ result = result + modresult;
+ }
+ WHILE_EACH_HOOK(ServerInstance, OnCheckBan);
- if (MOD_RESULT == -1)
- return true;
- else if (MOD_RESULT == 0)
+ if (result != MOD_RES_PASSTHRU)
+ return (result == MOD_RES_DENY);
+
+ 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, user->ident, 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
{
- /* This allows CIDR ban matching
- *
- * Full masked host Full unmasked host IP with/without CIDR
- */
- if ((match(user->GetFullHost(),i->data)) || (match(user->GetFullRealHost(),i->data)) || (match(mask, i->data, true)))
- {
- return true;
- }
+ return true;
}
}
return false;
}
-bool Channel::IsExtBanned(User *user, char type)
+ModResult Channel::GetExtBanStatus(const std::string &str, char type)
{
- // XXX. do we need events?
- char mask[MAXBUF];
- char *maskptr;
+ ModResult result;
+ DO_EACH_HOOK(ServerInstance, OnCheckStringExtBan, ModResult modresult, (str, this, type))
+ {
+ result = result + modresult;
+ }
+ WHILE_EACH_HOOK(ServerInstance, OnCheckStringExtBan);
- snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString());
+ if (result != MOD_RES_PASSTHRU)
+ return result;
+ // nobody decided for us, check the ban list
for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
{
if (i->data[0] != type || i->data[1] != ':')
continue;
- // Iterate past char and : to get to the mask without doing a data copy(!)
- maskptr = i->data;
- maskptr++; // past the char
- maskptr++; // past the :
+ 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);
- /* 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 (InspIRCd::Match(str, maskptr, NULL))
+ return MOD_RES_DENY;
}
- return false;
+ return MOD_RES_PASSTHRU;
+}
+
+ModResult Channel::GetExtBanStatus(User *user, char type)
+{
+ ModResult rv;
+ DO_EACH_HOOK(ServerInstance, OnCheckExtBan, ModResult modresult, (user, this, type))
+ {
+ rv = rv + modresult;
+ }
+ WHILE_EACH_HOOK(ServerInstance, OnCheckExtBan);
+
+ if (rv != MOD_RES_PASSTHRU)
+ return rv;
+
+ char mask[MAXBUF];
+ snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
+
+ rv = rv + this->GetExtBanStatus(mask, type);
+ rv = rv + this->GetExtBanStatus(user->GetFullHost(), type);
+ rv = 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.
*/
-long Channel::PartUser(User *user, const char* reason)
+long Channel::PartUser(User *user, std::string &reason)
{
- bool silent = false;
-
if (!user)
return this->GetUserCounter();
- UCListIter i = user->chans.find(this);
- if (i != user->chans.end())
+ Membership* memb = GetUser(user);
+
+ if (memb)
{
- FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason ? reason : "", silent));
+ CUList except_list;
+ FOREACH_MOD(I_OnUserPart,OnUserPart(memb, reason, except_list));
- if (!silent)
- this->WriteChannel(user, "PART %s%s%s", this->name, reason ? " :" : "", reason ? reason : "");
+ WriteAllExcept(user, false, 0, except_list, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : " :", reason.c_str());
- user->chans.erase(i);
+ user->chans.erase(this);
this->RemoveAllPrefixes(user);
}
/* kill the record */
if (iter != ServerInstance->chanlist->end())
{
- int MOD_RESULT = 0;
- FOREACH_RESULT_I(ServerInstance,I_OnChannelPreDelete, OnChannelPreDelete(this));
- if (MOD_RESULT == 1)
+ ModResult res;
+ FIRST_MOD_RESULT(ServerInstance, OnChannelPreDelete, res, (this));
+ if (res == MOD_RES_DENY)
return 1; // delete halted by module
FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
ServerInstance->chanlist->erase(iter);
return this->GetUserCounter();
}
-long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents, const char* servername)
+long Channel::ServerKickUser(User* user, const char* reason, const char* servername)
{
- bool silent = false;
-
- if (!user || !reason)
- return this->GetUserCounter();
-
- if (IS_LOCAL(user))
- {
- if (!this->HasUser(user))
- {
- /* Not on channel */
- return this->GetUserCounter();
- }
- }
-
if (servername == NULL || *ServerInstance->Config->HideWhoisServer)
servername = ServerInstance->Config->ServerName;
- if (triggerevents)
- {
- FOREACH_MOD(I_OnUserKick,OnUserKick(NULL, user, this, reason, silent));
- }
-
- UCListIter i = user->chans.find(this);
- if (i != user->chans.end())
- {
- if (!silent)
- this->WriteChannelWithServ(servername, "KICK %s %s :%s", this->name, user->nick, reason);
-
- user->chans.erase(i);
- this->RemoveAllPrefixes(user);
- }
-
- if (!this->DelUser(user))
- {
- chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
- /* kill the record */
- if (iter != ServerInstance->chanlist->end())
- {
- int MOD_RESULT = 0;
- FOREACH_RESULT_I(ServerInstance,I_OnChannelPreDelete, OnChannelPreDelete(this));
- if (MOD_RESULT == 1)
- return 1; // delete halted by module
- FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
- ServerInstance->chanlist->erase(iter);
- }
- return 0;
- }
-
- return this->GetUserCounter();
+ ServerInstance->FakeClient->server = servername;
+ return this->KickUser(ServerInstance->FakeClient, user, reason);
}
long Channel::KickUser(User *src, User *user, const char* reason)
{
- bool silent = false;
-
if (!src || !user || !reason)
return this->GetUserCounter();
+ Membership* memb = GetUser(user);
if (IS_LOCAL(src))
{
- if (!this->HasUser(user))
+ if (!memb)
{
- src->WriteNumeric(441, "%s %s %s :They are not on that channel",src->nick, user->nick, this->name);
+ src->WriteNumeric(ERR_USERNOTINCHANNEL, "%s %s %s :They are not on that channel",src->nick.c_str(), user->nick.c_str(), this->name.c_str());
return this->GetUserCounter();
}
if ((ServerInstance->ULine(user->server)) && (!ServerInstance->ULine(src->server)))
{
- src->WriteNumeric(482, "%s %s :Only a u-line may kick a u-line from a channel.",src->nick, this->name);
+ src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only a u-line may kick a u-line from a channel.",src->nick.c_str(), this->name.c_str());
return this->GetUserCounter();
}
- int MOD_RESULT = 0;
- if (!ServerInstance->ULine(src->server))
- {
- MOD_RESULT = 0;
- FOREACH_RESULT(I_OnUserPreKick,OnUserPreKick(src,user,this,reason));
- if (MOD_RESULT == 1)
- return this->GetUserCounter();
- }
- /* Set to -1 by OnUserPreKick if explicit allow was set */
- if (MOD_RESULT != -1)
+ ModResult res;
+ if (ServerInstance->ULine(src->server))
+ res = MOD_RES_ALLOW;
+ else
+ FIRST_MOD_RESULT(ServerInstance, OnUserPreKick, res, (src,memb,reason));
+
+ if (res == MOD_RES_DENY)
+ return this->GetUserCounter();
+
+ if (res == MOD_RES_PASSTHRU)
{
- FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(src,user,this,AC_KICK));
- if ((MOD_RESULT == ACR_DENY) && (!ServerInstance->ULine(src->server)))
- return this->GetUserCounter();
-
- if ((MOD_RESULT == ACR_DEFAULT) || (!ServerInstance->ULine(src->server)))
+ int them = this->GetPrefixValue(src);
+ int us = this->GetPrefixValue(user);
+ if ((them < HALFOP_VALUE) || (them < us))
{
- int them = this->GetStatus(src);
- int us = this->GetStatus(user);
- if ((them < STATUS_HOP) || (them < us))
- {
- src->WriteNumeric(482, "%s %s :You must be a channel %soperator",src->nick, this->name, them == STATUS_HOP ? "" : "half-");
- return this->GetUserCounter();
- }
+ src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator",src->nick.c_str(), this->name.c_str(), them >= HALFOP_VALUE ? "" : "half-");
+ return this->GetUserCounter();
}
}
}
- FOREACH_MOD(I_OnUserKick,OnUserKick(src, user, this, reason, silent));
-
- UCListIter i = user->chans.find(this);
- if (i != user->chans.end())
+ if (memb)
{
- /* zap it from the channel list of the user */
- if (!silent)
- this->WriteChannel(src, "KICK %s %s :%s", this->name, user->nick, reason);
+ CUList except_list;
+ FOREACH_MOD(I_OnUserKick,OnUserKick(src, memb, reason, except_list));
- user->chans.erase(i);
+ WriteAllExcept(src, false, 0, except_list, "KICK %s %s :%s", name.c_str(), user->nick.c_str(), reason);
+
+ user->chans.erase(this);
this->RemoveAllPrefixes(user);
}
if (!this->DelUser(user))
/* if there are no users left on the channel */
{
- chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
+ chan_hash::iterator iter = ServerInstance->chanlist->find(this->name.c_str());
/* kill the record */
if (iter != ServerInstance->chanlist->end())
{
- int MOD_RESULT = 0;
- FOREACH_RESULT_I(ServerInstance,I_OnChannelPreDelete, OnChannelPreDelete(this));
- if (MOD_RESULT == 1)
+ ModResult res;
+ FIRST_MOD_RESULT(ServerInstance, OnChannelPreDelete, res, (this));
+ if (res == MOD_RES_DENY)
return 1; // delete halted by module
FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
ServerInstance->chanlist->erase(iter);
void Channel::WriteChannel(User* user, const std::string &text)
{
- CUList *ulist = this->GetUsers();
char tb[MAXBUF];
if (!user)
return;
- snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),text.c_str());
+ snprintf(tb,MAXBUF,":%s %s", user->GetFullHost().c_str(), text.c_str());
std::string out = tb;
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
{
if (IS_LOCAL(i->first))
i->first->Write(out);
void Channel::WriteChannelWithServ(const char* ServName, const std::string &text)
{
- CUList *ulist = this->GetUsers();
char tb[MAXBUF];
- snprintf(tb,MAXBUF,":%s %s",ServName ? ServName : ServerInstance->Config->ServerName, text.c_str());
+ snprintf(tb,MAXBUF,":%s %s", ServName ? ServName : ServerInstance->Config->ServerName, text.c_str());
std::string out = tb;
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
{
if (IS_LOCAL(i->first))
i->first->Write(out);
if (!text)
return;
+ int offset = snprintf(textbuffer,MAXBUF,":%s ", user->GetFullHost().c_str());
+
va_start(argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ vsnprintf(textbuffer + offset, MAXBUF - offset, text, argsPtr);
va_end(argsPtr);
- this->WriteAllExcept(user, serversource, status, except_list, std::string(textbuffer));
+ this->RawWriteAllExcept(user, serversource, status, except_list, std::string(textbuffer));
}
void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const std::string &text)
{
- CUList *ulist = this->GetUsers();
char tb[MAXBUF];
- snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),text.c_str());
+ snprintf(tb,MAXBUF,":%s %s", serversource ? ServerInstance->Config->ServerName : user->GetFullHost().c_str(), text.c_str());
std::string out = tb;
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ this->RawWriteAllExcept(user, serversource, status, except_list, std::string(tb));
+}
+
+void Channel::RawWriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const std::string &out)
+{
+ char statmode = 0;
+ if (status)
+ {
+ ModeHandler* mh = ServerInstance->Modes->FindPrefix(status);
+ if (mh)
+ statmode = mh->GetModeChar();
+ }
+ for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
{
if ((IS_LOCAL(i->first)) && (except_list.find(i->first) == except_list.end()))
{
/* User doesnt have the status we're after */
- if (status && !strchr(this->GetAllPrefixChars(i->first), status))
+ if (statmode && !i->second->hasMode(statmode))
continue;
- if (serversource)
- i->first->WriteServ(text);
- else
- i->first->Write(out);
+ i->first->Write(out);
}
}
}
void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const std::string& text)
{
CUList except_list;
- except_list[user] = user->nick;
+ except_list.insert(user);
this->WriteAllExcept(user, serversource, status, except_list, std::string(text));
}
int Channel::CountInvisible()
{
int count = 0;
- CUList *ulist= this->GetUsers();
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
{
if (!(i->first->IsModeSet('i')))
count++;
switch (n)
{
case CM_KEY:
- extparam = (showkey ? this->key : "<key>");
- break;
- case CM_LIMIT:
- extparam = ConvToStr(this->limit);
- break;
+ // Unfortunately this must be special-cased, as we definitely don't want to always display key.
+ if (showkey)
+ {
+ extparam = this->GetModeParameter('k');
+ }
+ else
+ {
+ extparam = "<key>";
+ }
+ break;
case CM_NOEXTERNAL:
case CM_TOPICLOCK:
case CM_INVITEONLY:
/* compile a userlist of a channel into a string, each nick seperated by
* spaces and op, voice etc status shown as @ and +, and send it to 'user'
*/
-void Channel::UserList(User *user, CUList *ulist)
+void Channel::UserList(User *user)
{
char list[MAXBUF];
size_t dlen, curlen;
- int MOD_RESULT = 0;
- bool call_modules = true;
+ ModResult call_modules;
if (!IS_LOCAL(user))
return;
- FOREACH_RESULT(I_OnUserList,OnUserList(user, this, ulist));
- if (MOD_RESULT == 1)
- call_modules = false;
+ FIRST_MOD_RESULT(ServerInstance, OnUserList, call_modules, (user, this));
- if (MOD_RESULT != -1)
+ if (call_modules != MOD_RES_ALLOW)
{
if ((this->IsModeSet('s')) && (!this->HasUser(user)))
{
- user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, this->name);
+ user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), this->name.c_str());
return;
}
}
- dlen = curlen = snprintf(list,MAXBUF,"%s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name);
+ dlen = curlen = snprintf(list,MAXBUF,"%s %c %s :", user->nick.c_str(), this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name.c_str());
int numusers = 0;
char* ptr = list + dlen;
- if (!ulist)
- ulist = this->GetUsers();
-
/* Improvement by Brain - this doesnt change in value, so why was it inside
* the loop?
*/
bool has_user = this->HasUser(user);
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
{
if ((!has_user) && (i->first->IsModeSet('i')))
{
continue;
}
- if (i->first->Visibility && !i->first->Visibility->VisibleTo(user))
- continue;
-
std::string prefixlist = this->GetPrefixChar(i->first);
std::string nick = i->first->nick;
- if (call_modules)
+ if (call_modules != MOD_RES_DENY)
{
- FOREACH_MOD(I_OnNamesListItem, OnNamesListItem(user, i->first, this, prefixlist, nick));
-
+ FOREACH_MOD(I_OnNamesListItem, OnNamesListItem(user, i->second, prefixlist, nick));
+
/* Nick was nuked, a module wants us to skip it */
if (nick.empty())
continue;
}
-
+
size_t ptrlen = 0;
- if (curlen > (480-NICKMAX))
+ if (curlen + prefixlist.length() + nick.length() + 1 > 480)
{
/* list overflowed into multiple numerics */
- user->WriteServ(std::string(list));
+ user->WriteNumeric(RPL_NAMREPLY, std::string(list));
/* reset our lengths */
- dlen = curlen = snprintf(list,MAXBUF,"%s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name);
+ dlen = curlen = snprintf(list,MAXBUF,"%s %c %s :", user->nick.c_str(), this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name.c_str());
ptr = list + dlen;
ptrlen = 0;
/* if whats left in the list isnt empty, send it */
if (numusers)
{
- user->WriteNumeric(353,std::string(list));
+ user->WriteNumeric(RPL_NAMREPLY, std::string(list));
}
- user->WriteNumeric(366, "%s %s :End of /NAMES list.", user->nick, this->name);
+ user->WriteNumeric(RPL_ENDOFNAMES, "%s %s :End of /NAMES list.", user->nick.c_str(), this->name.c_str());
}
long Channel::GetMaxBans()
/* If there isnt one, we have to do some O(n) hax to find it the first time. (ick) */
for (std::map<std::string,int>::iterator n = ServerInstance->Config->maxbans.begin(); n != ServerInstance->Config->maxbans.end(); n++)
{
- if (match(this->name,n->first.c_str()))
+ if (InspIRCd::Match(this->name, n->first, NULL))
{
this->maxbans = n->second;
return n->second;
const char* Channel::GetPrefixChar(User *user)
{
static char pf[2] = {0, 0};
-
- prefixlist::iterator n = prefixes.find(user);
- if (n != prefixes.end())
+ *pf = 0;
+ unsigned int bestrank = 0;
+
+ UserMembIter m = userlist.find(user);
+ if (m != userlist.end())
{
- if (n->second.size())
+ for(unsigned int i=0; i < m->second->modes.length(); i++)
{
- /* If the user has any prefixes, their highest prefix
- * will always be at the head of the list, as the list is
- * sorted in rank order highest first (see SetPrefix()
- * for reasons why)
- */
- *pf = n->second.begin()->first;
- return pf;
+ char mchar = m->second->modes[i];
+ ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
+ if (mh && mh->GetPrefixRank() > bestrank && mh->GetPrefix())
+ {
+ bestrank = mh->GetPrefixRank();
+ pf[0] = mh->GetPrefix();
+ }
}
}
-
- *pf = 0;
return pf;
}
+unsigned int Membership::getRank()
+{
+ char mchar = modes.c_str()[0];
+ unsigned int rv = 0;
+ if (mchar)
+ {
+ ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
+ if (mh)
+ rv = mh->GetPrefixRank();
+ }
+ return rv;
+}
const char* Channel::GetAllPrefixChars(User* user)
{
- static char prefix[MAXBUF];
+ static char prefix[64];
int ctr = 0;
- *prefix = 0;
- prefixlist::iterator n = prefixes.find(user);
- if (n != prefixes.end())
+ UserMembIter m = userlist.find(user);
+ if (m != userlist.end())
{
- for (std::vector<prefixtype>::iterator x = n->second.begin(); x != n->second.end(); x++)
+ for(unsigned int i=0; i < m->second->modes.length(); i++)
{
- prefix[ctr++] = x->first;
+ char mchar = m->second->modes[i];
+ ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
+ if (mh && mh->GetPrefix())
+ prefix[ctr++] = mh->GetPrefix();
}
}
-
prefix[ctr] = 0;
return prefix;
unsigned int Channel::GetPrefixValue(User* user)
{
- prefixlist::iterator n = prefixes.find(user);
- if (n != prefixes.end())
- {
- if (n->second.size())
- return n->second.begin()->second;
- }
- return 0;
-}
-
-int Channel::GetStatusFlags(User *user)
-{
- UCListIter i = user->chans.find(this);
- if (i != user->chans.end())
- {
- return i->second;
- }
- return 0;
+ UserMembIter m = userlist.find(user);
+ if (m == userlist.end())
+ return 0;
+ return m->second->getRank();
}
-int Channel::GetStatus(User *user)
+void Channel::SetPrefix(User* user, char prefix, bool adding)
{
- if (ServerInstance->ULine(user->server))
- return STATUS_OP;
-
- UCListIter i = user->chans.find(this);
- if (i != user->chans.end())
+ ModeHandler* delta_mh = ServerInstance->Modes->FindMode(prefix, MODETYPE_CHANNEL);
+ if (!delta_mh)
+ return;
+ UserMembIter m = userlist.find(user);
+ if (m == userlist.end())
+ return;
+ for(unsigned int i=0; i < m->second->modes.length(); i++)
{
- if ((i->second & UCMODE_OP) > 0)
- {
- return STATUS_OP;
- }
- if ((i->second & UCMODE_HOP) > 0)
- {
- return STATUS_HOP;
- }
- if ((i->second & UCMODE_VOICE) > 0)
+ char mchar = m->second->modes[i];
+ ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
+ if (mh && mh->GetPrefixRank() <= delta_mh->GetPrefixRank())
{
- return STATUS_VOICE;
+ m->second->modes =
+ m->second->modes.substr(0,i) +
+ (adding ? std::string(1, prefix) : "") +
+ m->second->modes.substr(mchar == prefix ? i+1 : i);
+ return;
}
- return STATUS_NORMAL;
}
- return STATUS_NORMAL;
-}
-
-void Channel::SetPrefix(User* user, char prefix, unsigned int prefix_value, bool adding)
-{
- prefixlist::iterator n = prefixes.find(user);
- prefixtype pfx = std::make_pair(prefix,prefix_value);
if (adding)
- {
- if (n != prefixes.end())
- {
- if (std::find(n->second.begin(), n->second.end(), pfx) == n->second.end())
- {
- n->second.push_back(pfx);
- /* We must keep prefixes in rank order, largest first.
- * This is for two reasons, firstly because x-chat *ass-u-me's* this
- * state, and secondly it turns out to be a benefit to us later.
- * See above in GetPrefix().
- */
- std::sort(n->second.begin(), n->second.end(), ModeParser::PrefixComparison);
- }
- }
- else
- {
- pfxcontainer one;
- one.push_back(pfx);
- prefixes.insert(std::make_pair<User*,pfxcontainer>(user, one));
- }
- }
- else
- {
- if (n != prefixes.end())
- {
- pfxcontainer::iterator x = std::find(n->second.begin(), n->second.end(), pfx);
- if (x != n->second.end())
- n->second.erase(x);
- }
- }
+ m->second->modes += std::string(1, prefix);
}
void Channel::RemoveAllPrefixes(User* user)
{
- prefixlist::iterator n = prefixes.find(user);
- if (n != prefixes.end())
+ UserMembIter m = userlist.find(user);
+ if (m != userlist.end())
{
- prefixes.erase(n);
+ m->second->modes.clear();
}
}
-