From e835592cfc53c325608ea30cf58c6d5fba9d47b3 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sat, 9 Jan 2016 23:28:53 -0600 Subject: [PATCH] LIST: use new sendq system to reimplement SAFELIST differently. This is more like ratbox, but with the same filtering etc. features, and also using the hard sendq limit. --- modules/m_list.c | 149 ++++++----------------------------------------- 1 file changed, 19 insertions(+), 130 deletions(-) diff --git a/modules/m_list.c b/modules/m_list.c index dff4ed8f..d6295f54 100644 --- a/modules/m_list.c +++ b/modules/m_list.c @@ -52,8 +52,6 @@ #include "s_assert.h" #include "logger.h" -static rb_dlink_list safelisting_clients = { NULL, NULL, 0 }; - static int _modinit(void); static void _moddeinit(void); @@ -62,12 +60,8 @@ static int mo_list(struct Client *, struct Client *, int, const char **); static void list_one_channel(struct Client *source_p, struct Channel *chptr, int visible); -static void safelist_check_cliexit(hook_data_client_exit * hdata); static void safelist_client_instantiate(struct Client *, struct ListClient *); -static void safelist_client_release(struct Client *); static void safelist_one_channel(struct Client *source_p, struct Channel *chptr); -static void safelist_iterate_client(struct Client *source_p); -static void safelist_iterate_clients(void *unused); static void safelist_channel_named(struct Client *source_p, const char *name, int operspy); struct Message list_msgtab = { @@ -77,19 +71,10 @@ struct Message list_msgtab = { mapi_clist_av1 list_clist[] = { &list_msgtab, NULL }; -mapi_hfn_list_av1 list_hfnlist[] = { - {"client_exit", (hookfn) safelist_check_cliexit}, - {NULL, NULL} -}; - -DECLARE_MODULE_AV1(list, _modinit, _moddeinit, list_clist, NULL, list_hfnlist, "$Revision: 3372 $"); - -static struct ev_entry *iterate_clients_ev = NULL; +DECLARE_MODULE_AV1(list, _modinit, _moddeinit, list_clist, NULL, NULL, "$Revision: 3372 $"); static int _modinit(void) { - iterate_clients_ev = rb_event_add("safelist_iterate_clients", safelist_iterate_clients, NULL, 3); - /* ELIST=[tokens]: * * M = mask search @@ -106,23 +91,10 @@ static int _modinit(void) static void _moddeinit(void) { - rb_event_delete(iterate_clients_ev); - delete_isupport("SAFELIST"); delete_isupport("ELIST"); } -static void safelist_check_cliexit(hook_data_client_exit * hdata) -{ - /* Cancel the safelist request if we are disconnecting - * from the server. That way it doesn't core. :P --nenolod - */ - if (MyClient(hdata->target) && hdata->target->localClient->safelist_data != NULL) - { - safelist_client_release(hdata->target); - } -} - /* m_list() * parv[1] = channel * @@ -133,13 +105,6 @@ static int m_list(struct Client *client_p, struct Client *source_p, int parc, co { static time_t last_used = 0L; - if (source_p->localClient->safelist_data != NULL) - { - sendto_one_notice(source_p, ":/LIST aborted"); - safelist_client_release(source_p); - return 0; - } - if (parc < 2 || !IsChannelName(parv[1])) { /* pace this due to the sheer traffic involved */ @@ -166,13 +131,11 @@ static int mo_list(struct Client *client_p, struct Client *source_p, int parc, c char *args = NULL; int i; int operspy = 0; + int sendq_limit = get_sendq_hard(client_p); + rb_dlink_node *ptr; - if (source_p->localClient->safelist_data != NULL) - { - sendto_one_notice(source_p, ":/LIST aborted"); - safelist_client_release(source_p); - return 0; - } + sendq_limit /= 10; + sendq_limit *= 9; if (parc > 1) { @@ -284,7 +247,20 @@ static int mo_list(struct Client *client_p, struct Client *source_p, int parc, c } } - safelist_client_instantiate(source_p, params); + sendto_one(client_p, form_str(RPL_LISTSTART), me.name, client_p->name); + + RB_DLINK_FOREACH(ptr, global_channel_list.head) + { + safelist_one_channel(client_p, ptr->data); + + if (rb_linebuf_len(&client_p->localClient->buf_sendq) > sendq_limit) + { + sendto_one(source_p, form_str(ERR_TOOMANYMATCHES), me.name, source_p->name, "LIST"); + break; + } + } + + sendto_one(source_p, form_str(RPL_LISTEND), me.name, source_p->name); return 0; } @@ -331,58 +307,6 @@ static int safelist_sendq_exceeded(struct Client *client_p) return NO; } -/* - * safelist_client_instantiate() - * - * inputs - pointer to Client to be listed, - * pointer to ListClient for params - * outputs - none - * side effects - the safelist process begins for a - * client. - * - * Please do not ever call this on a non-local client. - * If you do, you will get SIGSEGV. - */ -static void safelist_client_instantiate(struct Client *client_p, struct ListClient *params) -{ - s_assert(MyClient(client_p)); - s_assert(params != NULL); - - client_p->localClient->safelist_data = params; - - sendto_one(client_p, form_str(RPL_LISTSTART), me.name, client_p->name); - - /* pop the client onto the queue for processing */ - rb_dlinkAddAlloc(client_p, &safelisting_clients); - - /* give the user some initial data to work with */ - safelist_iterate_client(client_p); -} - -/* - * safelist_client_release() - * - * inputs - pointer to Client being listed on - * outputs - none - * side effects - the client is no longer being - * listed - * - * Please do not ever call this on a non-local client. - * If you do, you will get SIGSEGV. - */ -static void safelist_client_release(struct Client *client_p) -{ - s_assert(MyClient(client_p)); - - rb_dlinkFindDestroy(client_p, &safelisting_clients); - - rb_free(client_p->localClient->safelist_data); - - client_p->localClient->safelist_data = NULL; - - sendto_one(client_p, form_str(RPL_LISTEND), me.name, client_p->name); -} - /* * safelist_channel_named() * @@ -462,38 +386,3 @@ static void safelist_one_channel(struct Client *source_p, struct Channel *chptr) list_one_channel(source_p, chptr, visible); } - -/* - * safelist_iterate_client() - * - * inputs - client pointer - * outputs - none - * side effects - the client's sendq is filled up again - */ -static void safelist_iterate_client(struct Client *source_p) -{ - rb_dlink_node *ptr; - int iter; - - for (iter = source_p->localClient->safelist_data->hash_indice; iter < CH_MAX; iter++) - { - if (safelist_sendq_exceeded(source_p->from) == YES) - { - source_p->localClient->safelist_data->hash_indice = iter; - return; - } - - RB_DLINK_FOREACH(ptr, channelTable[iter].head) - safelist_one_channel(source_p, (struct Channel *) ptr->data); - } - - safelist_client_release(source_p); -} - -static void safelist_iterate_clients(void *unused) -{ - rb_dlink_node *n, *n2; - - RB_DLINK_FOREACH_SAFE(n, n2, safelisting_clients.head) - safelist_iterate_client((struct Client *)n->data); -}