X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/77d3d2dbafbb44bc4dc87c9d4612a646c546af5d..ea41b24fd4807e3565bf5f8f293e2efc4c20b62d:/modules/m_list.c diff --git a/modules/m_list.c b/modules/m_list.c index 4947246d..29204c64 100644 --- a/modules/m_list.c +++ b/modules/m_list.c @@ -1,5 +1,5 @@ /* - * charybdis: An advanced ircd. + * Solanum: a slightly advanced ircd * m_list_safelist.c: Version of /list that uses the safelist code. * * Copyright (c) 2006 William Pitcock @@ -29,8 +29,6 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * $Id: m_list.c 3372 2007-04-03 10:18:07Z nenolod $ */ #include "stdinc.h" @@ -51,27 +49,32 @@ #include "inline/stringops.h" #include "s_assert.h" #include "logger.h" +#include "rb_radixtree.h" + +static const char list_desc[] = "Provides the LIST command to clients to view non-hidden channels"; static rb_dlink_list safelisting_clients = { NULL, NULL, 0 }; +static struct ev_entry *iterate_clients_ev = NULL; + static int _modinit(void); static void _moddeinit(void); -static int m_list(struct Client *, struct Client *, int, const char **); -static int mo_list(struct Client *, struct Client *, int, const char **); +static void m_list(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static void mo_list(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static void list_one_channel(struct Client *source_p, struct Channel *chptr, int visible); +static void safelist_one_channel(struct Client *source_p, struct Channel *chptr, struct ListClient *params); 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 = { - "LIST", 0, 0, 0, MFLG_SLOW, + "LIST", 0, 0, 0, 0, {mg_unreg, {m_list, 0}, mg_ignore, mg_ignore, mg_ignore, {mo_list, 0}} }; @@ -82,9 +85,7 @@ mapi_hfn_list_av1 list_hfnlist[] = { {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_AV2(list, _modinit, _moddeinit, list_clist, NULL, list_hfnlist, NULL, NULL, list_desc); static int _modinit(void) { @@ -129,7 +130,8 @@ static void safelist_check_cliexit(hook_data_client_exit * hdata) * XXX - With SAFELIST, do we really need to continue pacing? * In theory, the server cannot be lagged by this. --nenolod */ -static int m_list(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +static void +m_list(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static time_t last_used = 0L; @@ -137,7 +139,7 @@ static int m_list(struct Client *client_p, struct Client *source_p, int parc, co { sendto_one_notice(source_p, ":/LIST aborted"); safelist_client_release(source_p); - return 0; + return; } if (parc < 2 || !IsChannelName(parv[1])) @@ -147,19 +149,20 @@ static int m_list(struct Client *client_p, struct Client *source_p, int parc, co { sendto_one(source_p, form_str(RPL_LOAD2HI), me.name, source_p->name, "LIST"); sendto_one(source_p, form_str(RPL_LISTEND), me.name, source_p->name); - return 0; + return; } else last_used = rb_current_time(); } - return mo_list(client_p, source_p, parc, parv); + mo_list(msgbuf_p, client_p, source_p, parc, parv); } /* mo_list() * parv[1] = channel */ -static int mo_list(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +static void +mo_list(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct ListClient *params; char *p; @@ -171,7 +174,7 @@ static int mo_list(struct Client *client_p, struct Client *source_p, int parc, c { sendto_one_notice(source_p, ":/LIST aborted"); safelist_client_release(source_p); - return 0; + return; } if (parc > 1) @@ -190,17 +193,16 @@ static int mo_list(struct Client *client_p, struct Client *source_p, int parc, c if (args && IsChannelName(args)) { safelist_channel_named(source_p, args, operspy); - return 0; + return; } /* Multiple channels, possibly with parameters. */ params = rb_malloc(sizeof(struct ListClient)); - /* XXX rather arbitrary -- jilles */ - params->users_min = 3; + params->users_min = ConfigChannel.displayed_usercount; params->users_max = INT_MAX; params->operspy = operspy; - params->created_min = params->topic_min = + params->created_min = params->topic_min = params->created_max = params->topic_max = 0; if (args && !EmptyString(args)) @@ -286,8 +288,6 @@ static int mo_list(struct Client *client_p, struct Client *source_p, int parc, c } safelist_client_instantiate(source_p, params); - - return 0; } /* @@ -317,19 +317,16 @@ static void list_one_channel(struct Client *source_p, struct Channel *chptr, * safelist_sendq_exceeded() * * inputs - pointer to client that needs checking - * outputs - 1 if a client has exceeded the reserved - * sendq limit, 0 if not + * outputs - true if a client has exceeded the reserved + * sendq limit, false if not * side effects - none * * When safelisting, we only use half of the SendQ at any * given time. */ -static int safelist_sendq_exceeded(struct Client *client_p) +static bool safelist_sendq_exceeded(struct Client *client_p) { - if (rb_linebuf_len(&client_p->localClient->buf_sendq) > (get_sendq(client_p) / 2)) - return YES; - else - return NO; + return rb_linebuf_len(&client_p->localClient->buf_sendq) > (get_sendq(client_p) / 2); } /* @@ -367,16 +364,17 @@ static void safelist_client_instantiate(struct Client *client_p, struct ListClie * 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) { + if(!MyClient(client_p)) + return; + s_assert(MyClient(client_p)); rb_dlinkFindDestroy(client_p, &safelisting_clients); + rb_free(client_p->localClient->safelist_data->chname); rb_free(client_p->localClient->safelist_data); client_p->localClient->safelist_data = NULL; @@ -434,31 +432,30 @@ static void safelist_channel_named(struct Client *source_p, const char *name, in * side effects - a channel is listed if it meets the * requirements */ -static void safelist_one_channel(struct Client *source_p, struct Channel *chptr) +static void safelist_one_channel(struct Client *source_p, struct Channel *chptr, struct ListClient *params) { - struct ListClient *safelist_data = source_p->localClient->safelist_data; int visible; visible = !SecretChannel(chptr) || IsMember(source_p, chptr); - if (!visible && !safelist_data->operspy) + if (!visible && !params->operspy) return; - if ((unsigned int)chptr->members.length < safelist_data->users_min - || (unsigned int)chptr->members.length > safelist_data->users_max) + if ((unsigned int)chptr->members.length < params->users_min + || (unsigned int)chptr->members.length > params->users_max) return; - if (safelist_data->topic_min && chptr->topic_time < safelist_data->topic_min) + if (params->topic_min && chptr->topic_time < params->topic_min) return; /* If a topic TS is provided, don't show channels without a topic set. */ - if (safelist_data->topic_max && (chptr->topic_time > safelist_data->topic_max + if (params->topic_max && (chptr->topic_time > params->topic_max || chptr->topic_time == 0)) return; - if (safelist_data->created_min && chptr->channelts < safelist_data->created_min) + if (params->created_min && chptr->channelts < params->created_min) return; - if (safelist_data->created_max && chptr->channelts > safelist_data->created_max) + if (params->created_max && chptr->channelts > params->created_max) return; list_one_channel(source_p, chptr, visible); @@ -473,19 +470,20 @@ static void safelist_one_channel(struct Client *source_p, struct Channel *chptr) */ static void safelist_iterate_client(struct Client *source_p) { - rb_dlink_node *ptr; - int iter; + struct Channel *chptr; + rb_radixtree_iteration_state iter; - for (iter = source_p->localClient->safelist_data->hash_indice; iter < CH_MAX; iter++) + RB_RADIXTREE_FOREACH_FROM(chptr, &iter, channel_tree, source_p->localClient->safelist_data->chname) { - if (safelist_sendq_exceeded(source_p->from) == YES) + if (safelist_sendq_exceeded(source_p->from)) { - source_p->localClient->safelist_data->hash_indice = iter; + rb_free(source_p->localClient->safelist_data->chname); + source_p->localClient->safelist_data->chname = rb_strdup(chptr->chname); + return; } - RB_DLINK_FOREACH(ptr, channelTable[iter].head) - safelist_one_channel(source_p, (struct Channel *) ptr->data); + safelist_one_channel(source_p, chptr, source_p->localClient->safelist_data); } safelist_client_release(source_p); @@ -495,6 +493,6 @@ static void safelist_iterate_clients(void *unused) { rb_dlink_node *n, *n2; - RB_DLINK_FOREACH_SAFE(n, n2, safelisting_clients.head) + RB_DLINK_FOREACH_SAFE(n, n2, safelisting_clients.head) safelist_iterate_client((struct Client *)n->data); }