-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
* This program is free but copyrighted software; see
- * the file COPYING for details.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
-using namespace std;
+/* $Core: libIRCDchannels */
-#include <stdarg.h>
-#include "configreader.h"
#include "inspircd.h"
-#include "users.h"
-#include "modules.h"
+#include <cstdarg>
#include "wildcard.h"
#include "mode.h"
-chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance)
+Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts) : ServerInstance(Instance)
{
- *name = *topic = *setby = *key = 0;
- created = topicset = limit = 0;
- internal_userlist.clear();
- memset(&modes,0,64);
+ 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;
+ this->name.assign(cname, 0, ServerInstance->Config->Limits.ChanMax);
+ this->created = ts ? ts : ServerInstance->Time();
+ this->age = this->created;
+
+
+ maxbans = topicset = limit = 0;
+ memset(&modes, 0, 64);
}
-void chanrec::SetMode(char mode,bool mode_on)
+void Channel::SetMode(char mode,bool mode_on)
{
modes[mode-65] = mode_on;
if (!mode_on)
}
-void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on)
+void Channel::SetModeParam(char mode,const char* parameter,bool mode_on)
{
- ServerInstance->Log(DEBUG,"SetModeParam called");
-
- CustomModeList::iterator n = custom_mode_params.find(mode);
+ CustomModeList::iterator n = custom_mode_params.find(mode);
if (mode_on)
{
if (n == custom_mode_params.end())
- {
custom_mode_params[mode] = strdup(parameter);
- ServerInstance->Log(DEBUG,"Custom mode parameter %c %s added",mode,parameter);
- }
- else
- {
- ServerInstance->Log(DEBUG, "Tried to set custom mode parameter for %c '%s' when it was already '%s'", mode, parameter, n->second);
- }
}
else
{
}
}
-bool chanrec::IsModeSet(char mode)
+bool Channel::IsModeSet(char mode)
{
return modes[mode-65];
}
-std::string chanrec::GetModeParameter(char mode)
+std::string Channel::GetModeParameter(char mode)
{
- if (mode == 'k')
- {
- return this->key;
- }
- else if (mode == 'l')
+ switch (mode)
{
- return ConvToStr(this->limit);
- }
- else
- {
- CustomModeList::iterator n = custom_mode_params.find(mode);
- if (n != custom_mode_params.end())
- {
- return n->second;
- }
- return "";
+ 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;
}
}
-long chanrec::GetUserCounter()
+long Channel::GetUserCounter()
{
return (this->internal_userlist.size());
}
-void chanrec::AddUser(userrec* user)
+void Channel::AddUser(User* user)
{
- internal_userlist[user] = user;
+ internal_userlist[user] = user->nick;
}
-unsigned long chanrec::DelUser(userrec* user)
+unsigned long Channel::DelUser(User* user)
{
CUListIter a = internal_userlist.find(user);
-
+
if (a != internal_userlist.end())
{
internal_userlist.erase(a);
DelHalfoppedUser(user);
DelVoicedUser(user);
}
-
+
return internal_userlist.size();
}
-bool chanrec::HasUser(userrec* user)
+bool Channel::HasUser(User* user)
{
return (internal_userlist.find(user) != internal_userlist.end());
}
-void chanrec::AddOppedUser(userrec* user)
+void Channel::AddOppedUser(User* user)
{
- internal_op_userlist[user] = user;
+ internal_op_userlist[user] = user->nick;
}
-void chanrec::DelOppedUser(userrec* user)
+void Channel::DelOppedUser(User* user)
{
CUListIter a = internal_op_userlist.find(user);
if (a != internal_op_userlist.end())
}
}
-void chanrec::AddHalfoppedUser(userrec* user)
+void Channel::AddHalfoppedUser(User* user)
{
- internal_halfop_userlist[user] = user;
+ internal_halfop_userlist[user] = user->nick;
}
-void chanrec::DelHalfoppedUser(userrec* user)
+void Channel::DelHalfoppedUser(User* user)
{
CUListIter a = internal_halfop_userlist.find(user);
if (a != internal_halfop_userlist.end())
- {
+ {
internal_halfop_userlist.erase(a);
}
}
-void chanrec::AddVoicedUser(userrec* user)
+void Channel::AddVoicedUser(User* user)
{
- internal_voice_userlist[user] = user;
+ internal_voice_userlist[user] = user->nick;
}
-void chanrec::DelVoicedUser(userrec* user)
+void Channel::DelVoicedUser(User* user)
{
CUListIter a = internal_voice_userlist.find(user);
-
+
if (a != internal_voice_userlist.end())
{
internal_voice_userlist.erase(a);
}
}
-CUList* chanrec::GetUsers()
+CUList* Channel::GetUsers()
{
return &internal_userlist;
}
-CUList* chanrec::GetOppedUsers()
+CUList* Channel::GetOppedUsers()
{
return &internal_op_userlist;
}
-CUList* chanrec::GetHalfoppedUsers()
+CUList* Channel::GetHalfoppedUsers()
{
return &internal_halfop_userlist;
}
-CUList* chanrec::GetVoicedUsers()
+CUList* Channel::GetVoicedUsers()
{
return &internal_voice_userlist;
}
-/*
+void Channel::SetDefaultModes()
+{
+ ServerInstance->Logs->Log("CHANNELS", DEBUG, "SetDefaultModes %s", ServerInstance->Config->DefaultModes);
+ irc::spacesepstream list(ServerInstance->Config->DefaultModes);
+ std::string modeseq;
+ std::string parameter;
+
+ list.GetToken(modeseq);
+
+ for (std::string::iterator n = modeseq.begin(); n != modeseq.end(); ++n)
+ {
+ ModeHandler* mode = ServerInstance->Modes->FindMode(*n, MODETYPE_CHANNEL);
+ if (mode)
+ {
+ if (mode->GetNumParams(true))
+ list.GetToken(parameter);
+ else
+ parameter.clear();
+
+ mode->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, this, parameter, true);
+ }
+ }
+}
+
+/*
* 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
*/
-chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bool override, const char* key)
+Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool override, const char* key, bool bursting, time_t TS)
{
if (!user || !cn)
return NULL;
- bool new_channel = false;
char cname[MAXBUF];
int MOD_RESULT = 0;
- strlcpy(cname,cn,CHANMAX);
-
std::string privs;
+ Channel *Ptr;
+
+ /*
+ * We don't restrict the number of channels that remote users or users that are override-joining may be in.
+ * We restrict local users to MaxChans channels.
+ * We restrict local operators to OperMaxChans channels.
+ * This is a lot more logical than how it was formerly. -- w00t
+ */
+ if (IS_LOCAL(user) && !override)
+ {
+ if (user->GetMaxChans())
+ {
+ if (user->chans.size() >= user->GetMaxChans())
+ {
+ user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn);
+ return NULL;
+ }
+ }
+ else
+ {
+ if (IS_OPER(user))
+ {
+ if (user->chans.size() >= Instance->Config->OperMaxChans)
+ {
+ 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)
+ {
+ user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn);
+ return NULL;
+ }
+ }
+ }
+ }
- chanrec* Ptr = Instance->FindChan(cname);
+ strlcpy(cname, cn, Instance->Config->Limits.ChanMax);
+ Ptr = Instance->FindChan(cname);
if (!Ptr)
{
- privs = "@";
+ /*
+ * Fix: desync bug was here, don't set @ on remote users - spanningtree handles their permissions. bug #358. -- w00t
+ */
+ 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.c_str(), cn);
+ }
+ else
+ {
+ privs = "@";
+ }
- if (IS_LOCAL(user))
+ if (IS_LOCAL(user) && override == false)
{
MOD_RESULT = 0;
- FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname,privs));
+ FOREACH_RESULT_I(Instance,I_OnUserPreJoin, OnUserPreJoin(user, NULL, cname, privs, key ? key : ""));
if (MOD_RESULT == 1)
return NULL;
}
- /* create a new one */
- Ptr = new chanrec(Instance);
- Instance->chanlist[cname] = Ptr;
-
- strlcpy(Ptr->name, cname,CHANMAX);
- Ptr->modes[CM_TOPICLOCK] = Ptr->modes[CM_NOEXTERNAL] = 1;
- Ptr->created = Instance->Time();
- *Ptr->topic = 0;
- *Ptr->setby = 0;
- Ptr->topicset = 0;
- Instance->Log(DEBUG,"chanrec::JoinUser(): created: %s",cname);
- new_channel = true;
+ Ptr = new Channel(Instance, cname, TS);
}
else
{
* remote users are allowed us to bypass channel modes
* and bans (used by servers)
*/
- if (IS_LOCAL(user)) /* was a check on fd > -1 */
+ if (IS_LOCAL(user) && override == false)
{
MOD_RESULT = 0;
- FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname,privs));
+ FOREACH_RESULT_I(Instance,I_OnUserPreJoin, OnUserPreJoin(user, Ptr, cname, privs, key ? key : ""));
if (MOD_RESULT == 1)
{
return NULL;
}
else if (MOD_RESULT == 0)
{
- if (*Ptr->key)
+ if (!Ptr->key.empty())
{
MOD_RESULT = 0;
FOREACH_RESULT_I(Instance,I_OnCheckKey,OnCheckKey(user, Ptr, key ? key : ""));
if (!MOD_RESULT)
{
- if ((!key) || strcmp(key,Ptr->key))
+ if ((!key) || Ptr->key == key)
{
- user->WriteServ("475 %s %s :Cannot join channel (Incorrect channel key)",user->nick, Ptr->name);
+ user->WriteNumeric(ERR_BADCHANNELKEY, "%s %s :Cannot join channel (Incorrect channel key)",user->nick.c_str(), Ptr->name.c_str());
return NULL;
}
}
}
- if (Ptr->modes[CM_INVITEONLY])
+ if (Ptr->IsModeSet('i'))
{
MOD_RESULT = 0;
- irc::string xname(Ptr->name);
FOREACH_RESULT_I(Instance,I_OnCheckInvite,OnCheckInvite(user, Ptr));
if (!MOD_RESULT)
{
- if (user->IsInvited(xname))
- {
- /* user was invited to channel */
- /* there may be an optional channel NOTICE here */
- }
- else
+ if (!user->IsInvited(Ptr->name.c_str()))
{
- user->WriteServ("473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
+ user->WriteNumeric(ERR_INVITEONLYCHAN, "%s %s :Cannot join channel (Invite only)",user->nick.c_str(), Ptr->name.c_str());
return NULL;
}
}
- user->RemoveInvite(xname);
+ user->RemoveInvite(Ptr->name.c_str());
}
if (Ptr->limit)
{
{
if (Ptr->GetUserCounter() >= Ptr->limit)
{
- user->WriteServ("471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
+ 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())
{
- char mask[MAXBUF];
- snprintf(mask, MAXBUF, "%s!%s@%s",user->nick, user->ident, user->GetIPString());
if (Ptr->IsBanned(user))
{
- user->WriteServ("474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
+ user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)",user->nick.c_str(), Ptr->name.c_str());
return NULL;
}
}
}
}
- else
- {
- Instance->Log(DEBUG,"chanrec::JoinUser(): Overridden checks");
- }
- }
-
- for (UserChanList::const_iterator index = user->chans.begin(); index != user->chans.end(); index++)
- {
- if ((*index)->channel == NULL)
- {
- return chanrec::ForceChan(Instance, Ptr, *index, user, privs);
- }
}
- /*
- * XXX: If the user is an oper here, we can just extend their user->chans vector by one
- * and put the channel in here. Same for remote users which are not bound by
- * the channel limits. Otherwise, nope, youre boned.
- */
- if (!IS_LOCAL(user)) /* was a check on fd < 0 */
- {
- ucrec* a = new ucrec();
- chanrec* c = chanrec::ForceChan(Instance, Ptr, a, user, privs);
- user->chans.push_back(a);
- return c;
- }
- else if (*user->oper)
- {
- /* Oper allows extension up to the OPERMAXCHANS value */
- if (user->chans.size() < OPERMAXCHANS)
- {
- ucrec* a = new ucrec();
- chanrec* c = chanrec::ForceChan(Instance, Ptr, a, user, privs);
- user->chans.push_back(a);
- return c;
- }
- }
+ /* As spotted by jilles, dont bother to set this on remote users */
+ if (IS_LOCAL(user) && Ptr->GetUserCounter() == 0)
+ Ptr->SetDefaultModes();
- user->WriteServ("405 %s %s :You are on too many channels",user->nick, cname);
-
- if (new_channel)
- {
- Instance->Log(DEBUG,"BLAMMO, Whacking channel.");
- /* Things went seriously pear shaped, so take this away. bwahaha. */
- chan_hash::iterator n = Instance->chanlist.find(cname);
- if (n != Instance->chanlist.end())
- {
- Ptr->DelUser(user);
- DELETE(Ptr);
- Instance->chanlist.erase(n);
- for (unsigned int index =0; index < user->chans.size(); index++)
- {
- if (user->chans[index]->channel == Ptr)
- {
- user->chans[index]->channel = NULL;
- user->chans[index]->uc_modes = 0;
- }
- }
- }
- }
- else
- {
- for (unsigned int index =0; index < user->chans.size(); index++)
- {
- if (user->chans[index]->channel == Ptr)
- {
- user->chans[index]->channel = NULL;
- user->chans[index]->uc_modes = 0;
- }
- }
- }
- return NULL;
+ return Channel::ForceChan(Instance, Ptr, user, privs, bursting);
}
-chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* user, const std::string &privs)
+Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting)
{
- a->uc_modes = 0;
+ std::string nick = user->nick;
+ bool silent = false;
+
+ Ptr->AddUser(user);
+
+ /* Just in case they have no permissions */
+ user->chans[Ptr] = 0;
for (std::string::const_iterator x = privs.begin(); x != privs.end(); x++)
{
const char status = *x;
- switch (status)
- {
- case '@':
- a->uc_modes |= UCMODE_OP;
- break;
- case '%':
- a->uc_modes |= UCMODE_HOP;
- break;
- case '+':
- a->uc_modes |= UCMODE_VOICE;
- break;
- }
ModeHandler* mh = Instance->Modes->FindPrefix(status);
if (mh)
{
+ /* Set, and make sure that the mode handler knows this mode was now set */
Ptr->SetPrefix(user, status, mh->GetPrefixRank(), 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;
+ }
}
}
- a->channel = Ptr;
- Ptr->AddUser(user);
- user->ModChannelCount(1);
- Ptr->WriteChannel(user,"JOIN :%s",Ptr->name);
+ FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user, Ptr, bursting, silent));
+
+ if (!silent)
+ Ptr->WriteChannel(user,"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->WriteServ("332 %s %s :%s", user->nick, Ptr->name, Ptr->topic);
- user->WriteServ("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_OnUserJoin,OnUserJoin(user,Ptr));
+ FOREACH_MOD_I(Instance,I_OnPostJoin,OnPostJoin(user, Ptr));
return Ptr;
}
-bool chanrec::IsBanned(userrec* user)
+bool Channel::IsBanned(User* user)
{
char mask[MAXBUF];
int MOD_RESULT = 0;
FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, this));
- if (!MOD_RESULT)
+
+ if (MOD_RESULT == -1)
+ return true;
+ else if (MOD_RESULT == 0)
{
- snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString());
+ 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++)
{
/* 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 false;
}
-/* chanrec::PartUser
+bool Channel::IsExtBanned(const std::string &str, char type)
+{
+ 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] != ':')
+ 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);
+
+ if (match(str, maskptr))
+ return true;
+ }
+ }
+
+ return false;
+}
+
+bool Channel::IsExtBanned(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;
+
+ if (this->IsExtBanned(user->GetFullHost(), type))
+ return true;
+
+ if (this->IsExtBanned(user->GetFullRealHost(), type))
+ return true;
+ }
+
+ return false;
+}
+
+/* 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 chanrec.
+ * Therefore, if this function returns 0 the caller should delete the Channel.
+ *
+ * XXX: bleh, string copy of reason, fixme! -- w00t
*/
-long chanrec::PartUser(userrec *user, const char* reason)
+long Channel::PartUser(User *user, std::string &reason)
{
+ bool silent = false;
+
if (!user)
return this->GetUserCounter();
- for (unsigned int i =0; i < user->chans.size(); i++)
+ UCListIter i = user->chans.find(this);
+ if (i != user->chans.end())
{
- /* zap it from the channel list of the user */
- if (user->chans[i]->channel == this)
- {
- FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason ? reason : ""));
- this->WriteChannel(user, "PART %s%s%s", this->name, reason ? " :" : "", reason ? reason : "");
- user->chans[i]->uc_modes = 0;
- user->chans[i]->channel = NULL;
- user->ModChannelCount(-1);
- this->RemoveAllPrefixes(user);
- break;
- }
+ FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason, silent));
+
+ if (!silent)
+ this->WriteChannel(user, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : " :", reason.c_str());
+
+ user->chans.erase(i);
+ 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);
/* kill the record */
- if (iter != ServerInstance->chanlist.end())
+ if (iter != ServerInstance->chanlist->end())
{
- ServerInstance->Log(DEBUG,"del_channel: destroyed: %s", this->name);
- FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this));
- ServerInstance->chanlist.erase(iter);
+ 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();
}
-long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggerevents)
+long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents, const char* servername)
{
+ bool silent = false;
+
if (!user || !reason)
return this->GetUserCounter();
}
}
+ if (servername == NULL || *ServerInstance->Config->HideWhoisServer)
+ servername = ServerInstance->Config->ServerName;
+
if (triggerevents)
{
- FOREACH_MOD(I_OnUserKick,OnUserKick(NULL,user,this,reason));
+ FOREACH_MOD(I_OnUserKick,OnUserKick(NULL, user, this, reason, silent));
}
- for (unsigned int i =0; i < user->chans.size(); i++)
+ UCListIter i = user->chans.find(this);
+ if (i != user->chans.end())
{
- if (user->chans[i]->channel == this)
- {
- this->WriteChannelWithServ(ServerInstance->Config->ServerName, "KICK %s %s :%s", this->name, user->nick, reason);
- user->chans[i]->uc_modes = 0;
- user->chans[i]->channel = NULL;
- this->RemoveAllPrefixes(user);
- break;
- }
+ if (!silent)
+ this->WriteChannelWithServ(servername, "KICK %s %s :%s", this->name.c_str(), user->nick.c_str(), reason);
+
+ user->chans.erase(i);
+ this->RemoveAllPrefixes(user);
}
if (!this->DelUser(user))
{
- chan_hash::iterator iter = ServerInstance->chanlist.find(this->name);
+ chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
/* kill the record */
- if (iter != ServerInstance->chanlist.end())
+ if (iter != ServerInstance->chanlist->end())
{
- FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this));
- ServerInstance->chanlist.erase(iter);
+ 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();
}
-long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
+long Channel::KickUser(User *src, User *user, const char* reason)
{
+ bool silent = false;
+
if (!src || !user || !reason)
return this->GetUserCounter();
{
if (!this->HasUser(user))
{
- src->WriteServ("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->WriteServ("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;
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->GetStatus(src);
int us = this->GetStatus(user);
if ((them < STATUS_HOP) || (them < us))
{
- src->WriteServ("482 %s %s :You must be a channel %soperator",src->nick, this->name, them == STATUS_HOP ? "" : "half-");
+ src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator",src->nick.c_str(), this->name.c_str(), them == STATUS_HOP ? "" : "half-");
return this->GetUserCounter();
}
}
}
}
- FOREACH_MOD(I_OnUserKick,OnUserKick(src,user,this,reason));
-
- for (UserChanList::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
+ FOREACH_MOD(I_OnUserKick,OnUserKick(src, user, this, reason, silent));
+
+ UCListIter i = user->chans.find(this);
+ if (i != user->chans.end())
{
/* zap it from the channel list of the user */
- if ((*i)->channel == this)
- {
- this->WriteChannel(src, "KICK %s %s :%s", this->name, user->nick, reason);
- (*i)->uc_modes = 0;
- (*i)->channel = NULL;
- this->RemoveAllPrefixes(user);
- break;
- }
+ if (!silent)
+ this->WriteChannel(src, "KICK %s %s :%s", this->name.c_str(), user->nick.c_str(), reason);
+
+ user->chans.erase(i);
+ 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())
+ if (iter != ServerInstance->chanlist->end())
{
- FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this));
- ServerInstance->chanlist.erase(iter);
+ 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();
}
-void chanrec::WriteChannel(userrec* user, char* text, ...)
+void Channel::WriteChannel(User* user, const char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
this->WriteChannel(user, std::string(textbuffer));
}
-void chanrec::WriteChannel(userrec* user, const std::string &text)
+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().c_str(), text.c_str());
+ std::string out = tb;
+
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- if (IS_LOCAL(i->second))
- user->WriteTo(i->second,text);
+ if (IS_LOCAL(i->first))
+ i->first->Write(out);
}
}
-void chanrec::WriteChannelWithServ(const char* ServName, const char* text, ...)
+void Channel::WriteChannelWithServ(const char* ServName, const char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
this->WriteChannelWithServ(ServName, std::string(textbuffer));
}
-void chanrec::WriteChannelWithServ(const char* ServName, const std::string &text)
+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());
+ std::string out = tb;
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- if (IS_LOCAL(i->second))
- i->second->WriteServ(text);
+ if (IS_LOCAL(i->first))
+ i->first->Write(out);
}
}
/* write formatted text from a source user to all users on a channel except
* for the sender (for privmsg etc) */
-void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status, char* text, ...)
+void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
this->WriteAllExceptSender(user, serversource, status, std::string(textbuffer));
}
-void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status, const std::string& text)
+void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const char* text, ...)
{
- CUList *ulist;
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
- switch (status)
- {
- case '@':
- ulist = this->GetOppedUsers();
- break;
- case '%':
- ulist = this->GetHalfoppedUsers();
- break;
- case '+':
- ulist = this->GetVoicedUsers();
- break;
- default:
- ulist = this->GetUsers();
- break;
- }
+ if (!text)
+ return;
+
+ va_start(argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+
+ this->WriteAllExcept(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().c_str(), text.c_str());
+ std::string out = tb;
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- if ((IS_LOCAL(i->second)) && (user != i->second))
+ 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))
+ continue;
+
if (serversource)
- i->second->WriteServ(text);
+ i->first->WriteServ(text);
else
- i->second->WriteFrom(user,text);
+ 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;
+ this->WriteAllExcept(user, serversource, status, except_list, std::string(text));
+}
+
/*
* return a count of the users on a specific channel accounting for
* invisible users who won't increase the count. e.g. for /LIST
*/
-int chanrec::CountInvisible()
+int Channel::CountInvisible()
{
int count = 0;
CUList *ulist= this->GetUsers();
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- if (!(i->second->modes[UM_INVISIBLE]))
+ if (!(i->first->IsModeSet('i')))
count++;
}
return count;
}
-char* chanrec::ChanModes(bool showkey)
+char* Channel::ChanModes(bool showkey)
{
static char scratch[MAXBUF];
static char sparam[MAXBUF];
char* offset = scratch;
- std::string extparam = "";
+ std::string extparam;
*scratch = '\0';
*sparam = '\0';
- /* This was still iterating up to 190, chanrec::modes is only 64 elements -- Om */
+ /* This was still iterating up to 190, Channel::modes is only 64 elements -- Om */
for(int n = 0; n < 64; n++)
{
if(this->modes[n])
{
*offset++ = n + 65;
- extparam = "";
+ extparam.clear();
switch (n)
{
case CM_KEY:
extparam = this->GetModeParameter(n + 65);
break;
}
- if (extparam != "")
+ if (!extparam.empty())
{
charlcat(sparam,' ',MAXBUF);
strlcat(sparam,extparam.c_str(),MAXBUF);
/* 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 chanrec::UserList(userrec *user)
+void Channel::UserList(User *user, CUList *ulist)
{
char list[MAXBUF];
size_t dlen, curlen;
int MOD_RESULT = 0;
+ bool call_modules = true;
if (!IS_LOCAL(user))
return;
- FOREACH_RESULT(I_OnUserList,OnUserList(user, this));
- ServerInstance->Log(DEBUG,"MOD_RESULT for UserList = %d",MOD_RESULT);
+ FOREACH_RESULT(I_OnUserList,OnUserList(user, this, ulist));
if (MOD_RESULT == 1)
- return;
+ call_modules = false;
- ServerInstance->Log(DEBUG,"Using builtin NAMES list generation");
+ if (MOD_RESULT != -1)
+ {
+ if ((this->IsModeSet('s')) && (!this->HasUser(user)))
+ {
+ user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), this->name.c_str());
+ return;
+ }
+ }
- dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, 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;
- CUList *ulist= this->GetUsers();
+ if (!ulist)
+ ulist = this->GetUsers();
/* Improvement by Brain - this doesnt change in value, so why was it inside
* the loop?
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- if ((!has_user) && (i->second->modes[UM_INVISIBLE]))
+ if ((!has_user) && (i->first->IsModeSet('i')))
{
/*
* user is +i, and source not on the channel, does not show
continue;
}
- size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->second), i->second->nick);
+ if (i->first->Visibility && !i->first->Visibility->VisibleTo(user))
+ continue;
- curlen += ptrlen;
- ptr += ptrlen;
+ std::string prefixlist = this->GetPrefixChar(i->first);
+ std::string nick = i->first->nick;
- numusers++;
+ if (call_modules)
+ {
+ FOREACH_MOD(I_OnNamesListItem, OnNamesListItem(user, i->first, this, prefixlist, nick));
+
+ /* Nick was nuked, a module wants us to skip it */
+ if (nick.empty())
+ continue;
+ }
- if (curlen > (480-NICKMAX))
+ size_t ptrlen = 0;
+
+ if (curlen + prefixlist.length() + nick.length() + 1 > 480)
{
/* list overflowed into multiple numerics */
user->WriteServ(std::string(list));
/* reset our lengths */
- dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, 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;
numusers = 0;
}
+
+ ptrlen = snprintf(ptr, MAXBUF, "%s%s ", prefixlist.c_str(), nick.c_str());
+
+ curlen += ptrlen;
+ ptr += ptrlen;
+
+ numusers++;
}
/* if whats left in the list isnt empty, send it */
if (numusers)
{
- user->WriteServ(std::string(list));
+ user->WriteNumeric(RPL_NAMREPLY, std::string(list));
}
- user->WriteServ("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 chanrec::GetMaxBans()
+long Channel::GetMaxBans()
{
+ /* Return the cached value if there is one */
+ if (this->maxbans)
+ return this->maxbans;
+
+ /* 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 (match(this->name,n->first))
{
+ this->maxbans = n->second;
return n->second;
}
}
- return 64;
+
+ /* Screw it, just return the default of 64 */
+ this->maxbans = 64;
+ return this->maxbans;
}
+void Channel::ResetMaxBans()
+{
+ this->maxbans = 0;
+}
/* returns the status character for a given user on a channel, e.g. @ for op,
* % for halfop etc. If the user has several modes set, the highest mode
* the user has must be returned.
*/
-const char* chanrec::GetPrefixChar(userrec *user)
+const char* Channel::GetPrefixChar(User *user)
{
- static char px[2];
- unsigned int mx = 0;
-
- *px = 0;
- *(px+1) = 0;
+ static char pf[2] = {0, 0};
prefixlist::iterator n = prefixes.find(user);
if (n != prefixes.end())
{
- for (std::vector<prefixtype>::iterator x = n->second.begin(); x != n->second.end(); x++)
+ if (n->second.size())
{
- if (x->second > mx)
- {
- *px = x->first;
- mx = x->second;
- }
+ /* 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;
}
}
- return px;
+ *pf = 0;
+ return pf;
}
-const char* chanrec::GetAllPrefixChars(userrec* user)
+
+const char* Channel::GetAllPrefixChars(User* user)
{
static char prefix[MAXBUF];
int ctr = 0;
return prefix;
}
-unsigned int chanrec::GetPrefixValue(userrec* user)
+unsigned int Channel::GetPrefixValue(User* user)
{
- unsigned int mx = 0;
-
prefixlist::iterator n = prefixes.find(user);
if (n != prefixes.end())
{
- for (std::vector<prefixtype>::iterator x = n->second.begin(); x != n->second.end(); x++)
- {
- if (x->second > mx)
- mx = x->second;
- }
+ if (n->second.size())
+ return n->second.begin()->second;
}
-
- return mx;
+ return 0;
}
-
-int chanrec::GetStatusFlags(userrec *user)
+int Channel::GetStatusFlags(User *user)
{
- for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
+ UCListIter i = user->chans.find(this);
+ if (i != user->chans.end())
{
- if ((*i)->channel == this)
- {
- return (*i)->uc_modes;
- }
+ return i->second;
}
return 0;
}
-
-int chanrec::GetStatus(userrec *user)
+int Channel::GetStatus(User *user)
{
if (ServerInstance->ULine(user->server))
return STATUS_OP;
- for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
+ UCListIter i = user->chans.find(this);
+ if (i != user->chans.end())
{
- if ((*i)->channel == this)
+ if ((i->second & UCMODE_OP) > 0)
{
- if (((*i)->uc_modes & UCMODE_OP) > 0)
- {
- return STATUS_OP;
- }
- if (((*i)->uc_modes & UCMODE_HOP) > 0)
- {
- return STATUS_HOP;
- }
- if (((*i)->uc_modes & UCMODE_VOICE) > 0)
- {
- return STATUS_VOICE;
- }
- return STATUS_NORMAL;
+ return STATUS_OP;
}
+ if ((i->second & UCMODE_HOP) > 0)
+ {
+ return STATUS_HOP;
+ }
+ if ((i->second & UCMODE_VOICE) > 0)
+ {
+ return STATUS_VOICE;
+ }
+ return STATUS_NORMAL;
}
return STATUS_NORMAL;
}
-/*bool ModeParser::PrefixComparison(const prefixtype one, const prefixtype two)
-{
- return one.second > two.second;
-}*/
-
-void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, bool adding)
+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 (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);
}
}
{
pfxcontainer one;
one.push_back(pfx);
- prefixes.insert(std::make_pair<userrec*,pfxcontainer>(user, one));
+ prefixes.insert(std::make_pair<User*,pfxcontainer>(user, one));
}
}
else
}
}
-void chanrec::RemoveAllPrefixes(userrec* user)
+void Channel::RemoveAllPrefixes(User* user)
{
prefixlist::iterator n = prefixes.find(user);
if (n != prefixes.end())
+ {
prefixes.erase(n);
+ }
}
projects / user / henk / code / inspircd.git / blobdiff