X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/9f6c335332cb357b4bf5f991387087f907f6e55c..5c34bc991cc0cbc4570717ddfd360a0449b646e3:/modules/m_list.c

diff --git a/modules/m_list.c b/modules/m_list.c
index 933c571..ba83d89 100644
--- a/modules/m_list.c
+++ b/modules/m_list.c
@@ -34,11 +34,10 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"
@@ -47,7 +46,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "event.h"
 
 static rb_dlink_list safelisting_clients = { NULL, NULL, 0 };
 
@@ -79,16 +77,18 @@ mapi_hfn_list_av1 list_hfnlist[] = {
 
 DECLARE_MODULE_AV1(list, _modinit, _moddeinit, list_clist, NULL, list_hfnlist, "$Revision: 3372 $");
 
+static struct ev_entry *iterate_clients_ev = NULL;
+
 static int _modinit(void)
 {
-	eventAdd("safelist_iterate_clients", safelist_iterate_clients, NULL, 3);
+	iterate_clients_ev = rb_event_add("safelist_iterate_clients", safelist_iterate_clients, NULL, 3);
 
 	return 0;
 }
 
 static void _moddeinit(void)
 {
-	eventDelete(safelist_iterate_clients, NULL);
+	rb_event_delete(iterate_clients_ev);
 }
 
 static void safelist_check_cliexit(hook_data_client_exit * hdata)
@@ -103,7 +103,6 @@ static void safelist_check_cliexit(hook_data_client_exit * hdata)
 }
 
 /* m_list()
- *      parv[0] = sender prefix
  *      parv[1] = channel
  *
  * XXX - With SAFELIST, do we really need to continue pacing?
@@ -124,21 +123,20 @@ static int m_list(struct Client *client_p, struct Client *source_p, int parc, co
 	if (parc < 2 || !IsChannelName(parv[1]))
 	{
 		/* pace this due to the sheer traffic involved */
-		if (((last_used + ConfigFileEntry.pace_wait) > CurrentTime))
+		if (((last_used + ConfigFileEntry.pace_wait) > rb_current_time()))
 		{
 			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;
 		}
 		else
-			last_used = CurrentTime;
+			last_used = rb_current_time();
 	}
 
 	return mo_list(client_p, source_p, parc, parv);
 }
 
 /* mo_list()
- *      parv[0] = sender prefix
  *      parv[1] = channel
  */
 static int mo_list(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
@@ -224,7 +222,7 @@ static int mo_list(struct Client *client_p, struct Client *source_p, int parc, c
  */
 static int safelist_sendq_exceeded(struct Client *client_p)
 {
-	if (linebuf_len(&client_p->localClient->buf_sendq) > (get_sendq(client_p) / 2))
+	if (rb_linebuf_len(&client_p->localClient->buf_sendq) > (get_sendq(client_p) / 2))
 		return YES;
 	else
 		return NO;
@@ -249,7 +247,7 @@ static void safelist_client_instantiate(struct Client *client_p, struct ListClie
 	s_assert(MyClient(client_p));
 	s_assert(params != NULL);
 
-	self = MyMalloc(sizeof(struct ListClient));
+	self = rb_malloc(sizeof(struct ListClient));
 
 	self->hash_indice = 0;
 	self->users_min = params->users_min;
@@ -260,7 +258,7 @@ static void safelist_client_instantiate(struct Client *client_p, struct ListClie
 	sendto_one(client_p, form_str(RPL_LISTSTART), me.name, client_p->name);
 
 	/* pop the client onto the queue for processing */
-	dlinkAddAlloc(client_p, &safelisting_clients);
+	rb_dlinkAddAlloc(client_p, &safelisting_clients);
 
 	/* give the user some initial data to work with */
 	safelist_iterate_client(client_p);
@@ -283,7 +281,7 @@ static void safelist_client_release(struct Client *client_p)
 
 	rb_dlinkFindDestroy(client_p, &safelisting_clients);
 
-	MyFree(client_p->localClient->safelist_data);
+	rb_free(client_p->localClient->safelist_data);
 
 	client_p->localClient->safelist_data = NULL;
 
@@ -324,7 +322,7 @@ static void safelist_channel_named(struct Client *source_p, const char *name)
 		return;
 	}
 
-	if (ShowChannel(source_p, chptr))
+	if (!SecretChannel(chptr) || IsMember(source_p, chptr))
 		sendto_one(source_p, form_str(RPL_LIST), me.name, source_p->name, chptr->chname,
 			   rb_dlink_list_length(&chptr->members),
 			   chptr->topic == NULL ? "" : chptr->topic);