9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Let ops/voices bypass tgchange/floodcount if sending to users in their channel.

Browse source 
This was already possible by using CPRIVMSG/CNOTICE
instead of PRIVMSG/NOTICE.
This commit is contained in:
Jilles Tjoelker 2008-07-27 23:34:58 +02:00
parent ef57f7fb5e
commit c287438827
1 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
modules/core/m_message.c
View file

@ -90,6 +90,7 @@ static int build_target_list(int p_or_n, const char *command,
struct Client *client_p, struct Client *client_p,
struct Client *source_p, const char *nicks_channels, const char *text); struct Client *source_p, const char *nicks_channels, const char *text);
static struct Channel *find_allowing_channel(struct Client *source_p, struct Client *target_p);
static int flood_attack_client(int p_or_n, struct Client *source_p, struct Client *target_p); static int flood_attack_client(int p_or_n, struct Client *source_p, struct Client *target_p);
static int flood_attack_channel(int p_or_n, struct Client *source_p, static int flood_attack_channel(int p_or_n, struct Client *source_p,
struct Channel *chptr, char *chname); struct Channel *chptr, char *chname);
@ -648,6 +649,8 @@ static void
msg_client(int p_or_n, const char *command, msg_client(int p_or_n, const char *command,
struct Client *source_p, struct Client *target_p, const char *text) struct Client *source_p, struct Client *target_p, const char *text)
{ {
int do_floodcount = 0;
if(MyClient(source_p)) if(MyClient(source_p))
{ {
/* reset idle time for message only if its not to self /* reset idle time for message only if its not to self
@ -655,12 +658,16 @@ msg_client(int p_or_n, const char *command,
if(p_or_n != NOTICE) if(p_or_n != NOTICE)
source_p->localClient->last = rb_current_time(); source_p->localClient->last = rb_current_time();
/* auto cprivmsg/cnotice */
do_floodcount = !IsOper(source_p) &&
!find_allowing_channel(source_p, target_p);
/* target change stuff, dont limit ctcp replies as that /* target change stuff, dont limit ctcp replies as that
* would allow people to start filling up random users * would allow people to start filling up random users
* targets just by ctcping them * targets just by ctcping them
*/ */
if((p_or_n != NOTICE || *text != '\001') && if((p_or_n != NOTICE || *text != '\001') &&
ConfigFileEntry.target_change && !IsOper(source_p)) ConfigFileEntry.target_change && do_floodcount)
{ {
if(!add_target(source_p, target_p)) if(!add_target(source_p, target_p))
{ {
@ -703,7 +710,7 @@ msg_client(int p_or_n, const char *command,
form_str(ERR_NONONREG), form_str(ERR_NONONREG),
target_p->name); target_p->name);
/* Only so opers can watch for floods */ /* Only so opers can watch for floods */
if (MyClient(source_p)) if (do_floodcount)
(void) flood_attack_client(p_or_n, source_p, target_p); (void) flood_attack_client(p_or_n, source_p, target_p);
} }
else else
@ -731,7 +738,7 @@ msg_client(int p_or_n, const char *command,
target_p->localClient->last_caller_id_time = rb_current_time(); target_p->localClient->last_caller_id_time = rb_current_time();
} }
/* Only so opers can watch for floods */ /* Only so opers can watch for floods */
if (MyClient(source_p)) if (do_floodcount)
(void) flood_attack_client(p_or_n, source_p, target_p); (void) flood_attack_client(p_or_n, source_p, target_p);
} }
} }
@ -742,18 +749,33 @@ msg_client(int p_or_n, const char *command,
* we dont give warnings.. we then check if theyre opered * we dont give warnings.. we then check if theyre opered
* (to avoid flood warnings), lastly if theyre our client * (to avoid flood warnings), lastly if theyre our client
* and flooding -- fl */ * and flooding -- fl */
if(!MyClient(source_p) || IsOper(source_p) || if(!do_floodcount ||
!flood_attack_client(p_or_n, source_p, target_p)) !flood_attack_client(p_or_n, source_p, target_p))
sendto_anywhere(target_p, source_p, command, ":%s", text); sendto_anywhere(target_p, source_p, command, ":%s", text);
} }
} }
else if(!MyClient(source_p) || IsOper(source_p) || else if(!do_floodcount ||
!flood_attack_client(p_or_n, source_p, target_p)) !flood_attack_client(p_or_n, source_p, target_p))
sendto_anywhere(target_p, source_p, command, ":%s", text); sendto_anywhere(target_p, source_p, command, ":%s", text);
return; return;
} }
static struct Channel *
find_allowing_channel(struct Client *source_p, struct Client *target_p)
{
rb_dlink_node *ptr;
struct membership *msptr;
RB_DLINK_FOREACH(ptr, source_p->user->channel.head)
{
msptr = ptr->data;
if (is_chanop_voiced(msptr) && IsMember(target_p, msptr->chptr))
return msptr->chptr;
}
return NULL;
}
/* /*
* flood_attack_client * flood_attack_client
* inputs - flag 0 if PRIVMSG 1 if NOTICE. RFC * inputs - flag 0 if PRIVMSG 1 if NOTICE. RFC