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

whois: add a hook allowing for ShowChannel() behaviour to be overridden for channel visibility

Browse source
This commit is contained in:
William Pitcock 2016-01-05 18:37:42 -06:00
parent 5499771f0e
commit 9e07c8f70b
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/hook.h
View file

@ -59,6 +59,8 @@ typedef struct
{ {
struct Client *client; struct Client *client;
struct Client *target; struct Client *target;
struct Channel *chptr;
int approved;
} hook_data_client; } hook_data_client;
typedef struct typedef struct

22
modules/m_whois.c
View file

@ -60,11 +60,13 @@ struct Message whois_msgtab = {
int doing_whois_hook; int doing_whois_hook;
int doing_whois_global_hook; int doing_whois_global_hook;
int doing_whois_channel_visibility_hook;
mapi_clist_av1 whois_clist[] = { &whois_msgtab, NULL }; mapi_clist_av1 whois_clist[] = { &whois_msgtab, NULL };
mapi_hlist_av1 whois_hlist[] = { mapi_hlist_av1 whois_hlist[] = {
{ "doing_whois", &doing_whois_hook }, { "doing_whois", &doing_whois_hook },
{ "doing_whois_global", &doing_whois_global_hook }, { "doing_whois_global", &doing_whois_global_hook },
{ "doing_whois_channel_visibility", &doing_whois_channel_visibility_hook },
{ NULL, NULL } { NULL, NULL }
}; };
@ -236,7 +238,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
char *t; char *t;
int tlen; int tlen;
hook_data_client hdata; hook_data_client hdata;
int visible;
int extra_space = 0; int extra_space = 0;
#ifdef RB_IPV6 #ifdef RB_IPV6
struct sockaddr_in ip4; struct sockaddr_in ip4;
@ -271,6 +272,9 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
t = buf + mlen; t = buf + mlen;
hdata.client = source_p;
hdata.target = target_p;
if (!IsService(target_p)) if (!IsService(target_p))
{ {
RB_DLINK_FOREACH(ptr, target_p->user->channel.head) RB_DLINK_FOREACH(ptr, target_p->user->channel.head)
@ -278,9 +282,12 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
msptr = ptr->data; msptr = ptr->data;
chptr = msptr->chptr; chptr = msptr->chptr;
visible = ShowChannel(source_p, chptr); hdata.chptr = chptr;
if(visible || operspy) hdata.approved = ShowChannel(source_p, chptr);
call_hook(doing_whois_channel_visibility_hook, &hdata);
if(hdata.approved || operspy)
{ {
if((cur_len + strlen(chptr->chname) + 3) > (BUFSIZE - 5)) if((cur_len + strlen(chptr->chname) + 3) > (BUFSIZE - 5))
{ {
@ -290,7 +297,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
} }
tlen = rb_sprintf(t, "%s%s%s ", tlen = rb_sprintf(t, "%s%s%s ",
visible ? "" : "!", hdata.approved ? "" : "!",
find_channel_status(msptr, 1), find_channel_status(msptr, 1),
chptr->chname); chptr->chname);
t += tlen; t += tlen;
@ -404,9 +411,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
} }
} }
hdata.client = source_p;
hdata.target = target_p;
/* doing_whois_hook must only be called for local clients, /* doing_whois_hook must only be called for local clients,
* doing_whois_global_hook must only be called for local targets * doing_whois_global_hook must only be called for local targets
*/ */