ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 11:09:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added userrec::modebits - fast way of checking if user has +swi rather than an icky strchr

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3588 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2006-03-09 13:21:35 +00:00
parent 68da120812
commit c330b24501
7 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/mode.h
View File

@ -29,6 +29,12 @@
#include "channels.h"
#include "ctables.h"
enum UserModeBits {
UM_INVISIBLE = 1,
UM_SERVERNOTICE = 2,
UM_WALLOPS = 3
};
class ModeParser
{
private:

7
include/users.h
View File

@ -151,6 +151,13 @@ class userrec : public connection
*/
char modes[54];
/** This contains a bitmask of the RFC modes +swi,
* which can be used for fast lookup when iterating all the users.
* It is maintained by the mode parser and matches the character
* modes stored in 'modes'.
*/
char modebits;
std::vector<ucrec*> chans;
/** The server the user is connected to.

10
src/helperfuncs.cpp
View File

@ -975,7 +975,7 @@ void WriteOpers(char* text, ...)
if (IS_LOCAL(a))
{
if (strchr(a->modes,'s'))
if (a->modebits & UM_SERVERNOTICE)
{
// send server notices to all with +s
WriteServ(a->fd,"NOTICE %s :%s",a->nick,textbuffer);
@ -1118,7 +1118,7 @@ void WriteWallOps(userrec *source, bool local_only, char* text, ...)
{
userrec* t = (userrec*)(*i);
if ((IS_LOCAL(t)) && (strchr(t->modes,'w')))
if ((IS_LOCAL(t)) && (t->modebits & UM_WALLOPS))
{
WriteTo(source,t,"WALLOPS :%s",textbuffer);
}
@ -1335,7 +1335,7 @@ void userlist(userrec *user,chanrec *c)
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
if ((!has_user) && (strchr(i->second->modes,'i')))
if ((!has_user) && (i->second->modebits & UM_INVISIBLE))
{
/*
* user is +i, and source not on the channel, does not show
@ -1378,7 +1378,7 @@ int usercount_i(chanrec *c)
CUList *ulist= c->GetUsers();
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
if (!strchr(i->second->modes,'i'))
if (i->second->modebits & UM_INVISIBLE)
count++;
}
@ -1467,7 +1467,7 @@ int usercount_invisible(void)
for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
{
if ((i->second->registered == 7) && (strchr(i->second->modes,'i')))
if ((i->second->registered == 7) && (i->second->modebits & UM_INVISIBLE))
c++;
}

2
src/message.cpp
View File

@ -397,7 +397,7 @@ std::string chlist(userrec *user,userrec* source)
{
return lst;
}
bool userinvisible = (strchr(user->modes,'i'));
bool userinvisible = (user->modebits & UM_INVISIBLE);
for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
{
if ((((ucrec*)(*i))->channel != NULL) && (((ucrec*)(*i))->channel->name))

26
src/mode.cpp
View File

@ -1239,9 +1239,20 @@ void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
{
charlcat(dmodes,*i,53);
charlcat(outpars,*i,MAXMODES);
if (*i == 'o')
switch (*i)
{
case 'o':
FOREACH_MOD(I_OnGlobalOper,OnGlobalOper(dest));
break;
case 'i':
dest->modebits |= UM_INVISIBLE;
break;
case 's':
dest->modebits |= UM_SERVERNOTICE;
break;
case 'w':
dest->modebits |= UM_WALLOPS;
break;
}
}
}
@ -1254,10 +1265,21 @@ void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
{
charlcat(outpars,*i,MAXMODES);
charremove(dmodes,*i);
if (*i == 'o')
switch (*i)
{
case 'o':
*dest->oper = 0;
DeleteOper(dest);
break;
case 'i':
dest->modebits ^= UM_INVISIBLE;
break;
case 's':
dest->modebits ^= UM_SERVERNOTICE;
break;
case 'w':
dest->modebits ^= UM_WALLOPS;
break;
}
}
}

2
src/svn-rev.sh
View File

@ -1 +1 @@
echo 3581
echo 3586

2
src/users.cpp
View File

@ -107,7 +107,7 @@ userrec::userrec()
server = (char*)FindServerNamePtr(Config->ServerName);
reset_due = TIME;
lines_in = fd = lastping = signon = idle_lastmsg = nping = registered = 0;
timeout = flood = port = bytes_in = bytes_out = cmds_in = cmds_out = 0;
modebits = timeout = flood = port = bytes_in = bytes_out = cmds_in = cmds_out = 0;
haspassed = dns_done = false;
recvq = "";
sendq = "";