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

callerid: implement relaxed caller id mode (+G)

Browse source
This commit is contained in:
Ariadne Conill 2020-06-26 19:33:49 +00:00
parent 7106e36ed3
commit 7b60cca0f1
1 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
modules/um_callerid.c
View file

@ -47,6 +47,7 @@ static int
um_callerid_modinit(void) um_callerid_modinit(void)
{ {
user_modes['g'] = find_umode_slot(); user_modes['g'] = find_umode_slot();
user_modes['G'] = find_umode_slot();
construct_umodebuf(); construct_umodebuf();
add_isupport("CALLERID", isupport_string, "g"); add_isupport("CALLERID", isupport_string, "g");
@ -58,16 +59,33 @@ static void
um_callerid_moddeinit(void) um_callerid_moddeinit(void)
{ {
user_modes['g'] = 0; user_modes['g'] = 0;
user_modes['G'] = 0;
construct_umodebuf(); construct_umodebuf();
delete_isupport("CALLERID"); delete_isupport("CALLERID");
} }
#define IsSetCallerID(c) ((c->umodes & user_modes['g']) == user_modes['g']) #define IsSetCallerID(c) ((c->umodes & user_modes['g']) == user_modes['g'])
#define IsSetRelaxedCallerID(c) ((c->umodes & user_modes['G']) == user_modes['G'])
static const char um_callerid_desc[] = static const char um_callerid_desc[] =
"Provides usermode +g which restricts messages from unauthorized users."; "Provides usermode +g which restricts messages from unauthorized users.";
static bool
has_common_channel(struct Client *source_p, struct Client *target_p)
{
rb_dlink_node *ptr;
RB_DLINK_FOREACH(ptr, source_p->user->channel.head)
{
struct membership *msptr = ptr->data;
if (IsMember(target_p, msptr->chptr))
return msptr->chptr;
}
return NULL;
}
static bool static bool
allow_message(struct Client *source_p, struct Client *target_p) allow_message(struct Client *source_p, struct Client *target_p)
{ {
@ -77,6 +95,9 @@ allow_message(struct Client *source_p, struct Client *target_p)
if (!IsSetCallerID(target_p)) if (!IsSetCallerID(target_p))
return true; return true;
if (IsSetRelaxedCallerID(target_p) && has_common_channel(source_p, target_p))
return true;
if (IsServer(source_p)) if (IsServer(source_p))
return true; return true;