-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * InspIRCd: (C) 2002-2007 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;
-
+#include "inspircd.h"
#include <stdarg.h>
#include "configreader.h"
-#include "inspircd.h"
#include "users.h"
#include "modules.h"
#include "wildcard.h"
chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance)
{
*name = *topic = *setby = *key = 0;
- created = topicset = limit = 0;
- internal_userlist.clear();
+ maxbans = created = topicset = limit = 0;
memset(&modes,0,64);
+ age = ServerInstance->Time(true);
}
void chanrec::SetMode(char mode,bool mode_on)
void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on)
{
- ServerInstance->Log(DEBUG,"SetModeParam called");
-
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
{
std::string chanrec::GetModeParameter(char mode)
{
- if (mode == 'k')
- {
- return this->key;
- }
- else if (mode == 'l')
- {
- return ConvToStr(this->limit);
- }
- else
+ switch (mode)
{
- 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;
}
}
void chanrec::AddUser(userrec* user)
{
- internal_userlist[user] = user;
+ internal_userlist[user] = user->nick;
}
unsigned long chanrec::DelUser(userrec* user)
void chanrec::AddOppedUser(userrec* user)
{
- internal_op_userlist[user] = user;
+ internal_op_userlist[user] = user->nick;
}
void chanrec::DelOppedUser(userrec* user)
void chanrec::AddHalfoppedUser(userrec* user)
{
- internal_halfop_userlist[user] = user;
+ internal_halfop_userlist[user] = user->nick;
}
void chanrec::DelHalfoppedUser(userrec* user)
void chanrec::AddVoicedUser(userrec* user)
{
- internal_voice_userlist[user] = user;
+ internal_voice_userlist[user] = user->nick;
}
void chanrec::DelVoicedUser(userrec* user)
return &internal_voice_userlist;
}
+void chanrec::SetDefaultModes()
+{
+ irc::spacesepstream list(ServerInstance->Config->DefaultModes);
+ std::string modeseq = list.GetToken();
+ std::string parameter;
+ userrec* dummyuser = new userrec(ServerInstance);
+ dummyuser->SetFd(FD_MAGIC_NUMBER);
+
+ 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))
+ parameter = list.GetToken().c_str();
+ else
+ parameter.clear();
+
+ mode->OnModeChange(dummyuser, dummyuser, this, parameter, true);
+ }
+ }
+
+ delete dummyuser;
+}
+
/*
* add a channel to a user, creating the record for it if needed and linking
* it to the user record
*/
-chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bool override, const char* key)
+chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bool override, const char* key, time_t TS)
{
if (!user || !cn)
return NULL;
- int created = 0;
char cname[MAXBUF];
int MOD_RESULT = 0;
- strlcpy(cname,cn,CHANMAX);
+ std::string privs;
+ chanrec *Ptr;
- chanrec* Ptr = Instance->FindChan(cname);
+ /*
+ * 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->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
+ return NULL;
+ }
+ }
+ else
+ {
+ if (IS_OPER(user))
+ {
+ if (user->chans.size() >= Instance->Config->OperMaxChans)
+ {
+ user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
+ return NULL;
+ }
+ }
+ else
+ {
+ if (user->chans.size() >= Instance->Config->MaxChans)
+ {
+ user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
+ return NULL;
+ }
+ }
+ }
+ }
+
+ strlcpy(cname, cn, CHANMAX);
+ Ptr = Instance->FindChan(cname);
if (!Ptr)
{
- if (IS_LOCAL(user))
+ /*
+ * 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->Log(DEBUG,"*** BUG *** chanrec::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick, cn);
+ }
+ else
+ {
+ privs = "@";
+ }
+
+ if (IS_LOCAL(user) && override == false)
{
MOD_RESULT = 0;
- FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname));
+ FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname,privs));
if (MOD_RESULT == 1)
return NULL;
}
/* create a new one */
Ptr = new chanrec(Instance);
- Instance->chanlist[cname] = Ptr;
+ (*(Instance->chanlist))[cname] = Ptr;
strlcpy(Ptr->name, cname,CHANMAX);
- Ptr->modes[CM_TOPICLOCK] = Ptr->modes[CM_NOEXTERNAL] = 1;
- Ptr->created = Instance->Time();
+
+ /* As spotted by jilles, dont bother to set this on remote users */
+ if (IS_LOCAL(user))
+ Ptr->SetDefaultModes();
+
+ Ptr->created = TS ? TS : Instance->Time();
+ Ptr->age = Ptr->created;
*Ptr->topic = 0;
- strlcpy(Ptr->setby, user->nick,NICKMAX-1);
+ *Ptr->setby = 0;
Ptr->topicset = 0;
- Instance->Log(DEBUG,"chanrec::JoinUser(): created: %s",cname);
- /*
- * set created to 2 to indicate user
- * is the first in the channel
- * and should be given ops
- */
- created = 2;
}
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));
+ FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname,privs));
if (MOD_RESULT == 1)
{
return NULL;
FOREACH_RESULT_I(Instance,I_OnCheckKey,OnCheckKey(user, Ptr, key ? key : ""));
if (!MOD_RESULT)
{
- if (!key)
+ if ((!key) || strcmp(key,Ptr->key))
{
- Instance->Log(DEBUG,"chanrec::JoinUser(): no key given in JOIN");
- user->WriteServ("475 %s %s :Cannot join channel (Requires key)",user->nick, Ptr->name);
+ user->WriteServ("475 %s %s :Cannot join channel (Incorrect channel key)",user->nick, Ptr->name);
return NULL;
}
- else
- {
- if (strcmp(key,Ptr->key))
- {
- Instance->Log(DEBUG,"chanrec::JoinUser(): bad key given in JOIN");
- user->WriteServ("475 %s %s :Cannot join channel (Incorrect key)",user->nick, Ptr->name);
- 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))
{
user->WriteServ("473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
return NULL;
}
}
- user->RemoveInvite(xname);
+ user->RemoveInvite(Ptr->name);
}
if (Ptr->limit)
{
}
if (Ptr->bans.size())
{
- MOD_RESULT = 0;
- FOREACH_RESULT_I(Instance,I_OnCheckBan,OnCheckBan(user, Ptr));
- char mask[MAXBUF];
- sprintf(mask,"%s!%s@%s",user->nick, user->ident, user->GetIPString());
- if (!MOD_RESULT)
+ if (Ptr->IsBanned(user))
{
- for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->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)))
- {
- user->WriteServ("474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
- return NULL;
- }
- }
+ user->WriteServ("474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
+ return NULL;
}
}
}
}
- else
- {
- Instance->Log(DEBUG,"chanrec::JoinUser(): Overridden checks");
- }
- created = 1;
}
- for (UserChanList::const_iterator index = user->chans.begin(); index != user->chans.end(); index++)
- {
- if ((*index)->channel == NULL)
- {
- return chanrec::ForceChan(Instance, Ptr, *index, user, created);
- }
- }
+ return chanrec::ForceChan(Instance, Ptr, 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,created);
- 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,created);
- user->chans.push_back(a);
- return c;
- }
- }
+chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, const std::string &privs)
+{
+ userrec* dummyuser = new userrec(Instance);
+ std::string nick = user->nick;
+ bool silent = false;
- user->WriteServ("405 %s %s :You are on too many channels",user->nick, cname);
+ dummyuser->SetFd(FD_MAGIC_NUMBER);
+ Ptr->AddUser(user);
- if (created == 2)
- {
- 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
+ /* Just in case they have no permissions */
+ user->chans[Ptr] = 0;
+
+ for (std::string::const_iterator x = privs.begin(); x != privs.end(); x++)
{
- for (unsigned int index =0; index < user->chans.size(); index++)
+ const char status = *x;
+ ModeHandler* mh = Instance->Modes->FindPrefix(status);
+ if (mh)
{
- if (user->chans[index]->channel == Ptr)
+ Ptr->SetPrefix(user, status, mh->GetPrefixRank(), true);
+ /* Make sure that the mode handler knows this mode was now set */
+ mh->OnModeChange(dummyuser, dummyuser, Ptr, nick, true);
+
+ switch (mh->GetPrefix())
{
- user->chans[index]->channel = NULL;
- user->chans[index]->uc_modes = 0;
+ /* 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;
}
}
}
- return NULL;
-}
-chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* user, int created)
-{
- if (created == 2)
- {
- /* first user in is given ops */
- a->uc_modes = UCMODE_OP;
- Ptr->AddOppedUser(user);
- Ptr->SetPrefix(user, '@', OP_VALUE, true);
- }
- else
- {
- a->uc_modes = 0;
- }
+ delete dummyuser;
- 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, silent));
+
+ if (!silent)
+ Ptr->WriteChannel(user,"JOIN :%s",Ptr->name);
+
+ /* 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());
/* Major improvement by Brain - we dont need to be calculating all this pointlessly for remote users */
if (IS_LOCAL(user))
}
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)
+{
+ char mask[MAXBUF];
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, this));
+ if (!MOD_RESULT)
+ {
+ snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, 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 true;
+ }
+ }
+ }
+ return false;
+}
+
/* chanrec::PartUser
- * remove a channel from a users record, and remove the record from the hash
- * if the channel has become empty
+ * 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.
*/
long chanrec::PartUser(userrec *user, const char* 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)
- {
- if (reason)
- {
- FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason));
- this->WriteChannel(user, "PART %s :%s", this->name, reason);
- }
- else
- {
- FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, ""));
- this->WriteChannel(user, "PART :%s", this->name);
- }
- 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 ? reason : "", silent));
+
+ if (!silent)
+ this->WriteChannel(user, "PART %s%s%s", this->name, reason ? " :" : "", reason ? 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);
/* 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);
+ ServerInstance->chanlist->erase(iter);
}
return 0;
}
long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggerevents)
{
+ bool silent = false;
+
if (!user || !reason)
return this->GetUserCounter();
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)
- {
+ if (!silent)
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;
- }
+
+ 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);
+ ServerInstance->chanlist->erase(iter);
}
return 0;
}
long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
{
+ bool silent = false;
+
if (!src || !user || !reason)
return this->GetUserCounter();
int us = this->GetStatus(user);
if ((them < STATUS_HOP) || (them < us))
{
- if (them == STATUS_HOP)
- {
- src->WriteServ("482 %s %s :You must be a channel operator",src->nick, this->name);
- }
- else
- {
- src->WriteServ("482 %s %s :You must be at least a half-operator",src->nick, this->name);
- }
+ src->WriteServ("482 %s %s :You must be a channel %soperator",src->nick, this->name, 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)
- {
+ if (!silent)
this->WriteChannel(src, "KICK %s %s :%s", this->name, user->nick, reason);
- (*i)->uc_modes = 0;
- (*i)->channel = NULL;
- this->RemoveAllPrefixes(user);
- break;
- }
+
+ 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())
{
FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this));
- ServerInstance->chanlist.erase(iter);
+ ServerInstance->chanlist->erase(iter);
}
return 0;
}
void chanrec::WriteChannel(userrec* 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());
+ 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 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, char status, char* text, ...)
+void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status, char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
- if (!user || !text)
+ if (!text)
return;
va_start(argsPtr, text);
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- this->WriteAllExceptSender(user, status, std::string(textbuffer));
+ this->WriteAllExceptSender(user, serversource, status, std::string(textbuffer));
}
-void chanrec::WriteAllExceptSender(userrec* user, char status, const std::string& text)
+void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CUList &except_list, char* text, ...)
{
- CUList *ulist;
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
- if (!user)
+ 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 chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CUList &except_list, const std::string &text)
+{
+ CUList *ulist;
+ char tb[MAXBUF];
+
switch (status)
{
case '@':
break;
}
+ snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),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))
- i->second->WriteFrom(user,text);
+ if ((IS_LOCAL(i->first)) && (except_list.find(i->first) == except_list.end()))
+ {
+ if (serversource)
+ i->first->WriteServ(text);
+ else
+ i->first->Write(out);
+ }
}
}
+void chanrec::WriteAllExceptSender(userrec* 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
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++;
}
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::custom_modes is only 64 elements -- Om */
+ /* This was still iterating up to 190, chanrec::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 chanrec::UserList(userrec *user, CUList *ulist)
{
char list[MAXBUF];
size_t dlen, curlen;
int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnUserList,OnUserList(user, this));
- ServerInstance->Log(DEBUG,"MOD_RESULT for UserList = %d",MOD_RESULT);
- if (MOD_RESULT == 1)
+ if (!IS_LOCAL(user))
return;
- ServerInstance->Log(DEBUG,"Using builtin NAMES list generation");
+ FOREACH_RESULT(I_OnUserList,OnUserList(user, this, ulist));
+ if (MOD_RESULT == 1)
+ return;
dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name);
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;
+
+ size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->first), i->second.c_str());
+ /* OnUserList can change this - reset it back to normal */
+ i->second = i->first->nick;
curlen += ptrlen;
ptr += ptrlen;
if (curlen > (480-NICKMAX))
{
/* list overflowed into multiple numerics */
- user->WriteServ(list);
+ user->WriteServ(std::string(list));
/* reset our lengths */
dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name);
/* if whats left in the list isnt empty, send it */
if (numusers)
{
- user->WriteServ(list);
+ user->WriteServ(std::string(list));
}
user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, this->name);
long chanrec::GetMaxBans()
{
- std::string x;
+ /* 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++)
{
- x = n->first;
- if (match(this->name,x.c_str()))
+ if (match(this->name,n->first.c_str()))
{
+ this->maxbans = n->second;
return n->second;
}
}
- return 64;
+
+ /* Screw it, just return the default of 64 */
+ this->maxbans = 64;
+ return this->maxbans;
}
+void chanrec::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
*/
const char* chanrec::GetPrefixChar(userrec *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)
unsigned int chanrec::GetPrefixValue(userrec* 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)
{
- 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)
{
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)
{
prefixlist::iterator n = prefixes.find(user);
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);
}
}
{
prefixlist::iterator n = prefixes.find(user);
if (n != prefixes.end())
+ {
prefixes.erase(n);
+ }
}
projects / user / henk / code / inspircd.git / blobdiff