X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/105a4985b402b3ab294e3bec1fa75bac75430482..4b1cce65ed584cc0fdc9f3c5ec84373fdf2566a8:/modules/core/m_mode.c

diff --git a/modules/core/m_mode.c b/modules/core/m_mode.c
index c84ffaaf..61f0ee3b 100644
--- a/modules/core/m_mode.c
+++ b/modules/core/m_mode.c
@@ -40,11 +40,14 @@
 #include "packet.h"
 #include "s_newconf.h"
 
-static int m_mode(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int ms_mode(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int ms_tmode(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int ms_mlock(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int ms_bmask(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static const char mode_desc[] =
+	"Provides the MODE and MLOCK client and server commands, and TS6 server-to-server TMODE and BMASK commands";
+
+static void m_mode(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_mode(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_tmode(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_mlock(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_bmask(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message mode_msgtab = {
 	"MODE", 0, 0, 0, 0,
@@ -65,13 +68,13 @@ struct Message bmask_msgtab = {
 
 mapi_clist_av1 mode_clist[] = { &mode_msgtab, &tmode_msgtab, &mlock_msgtab, &bmask_msgtab, NULL };
 
-DECLARE_MODULE_AV2(mode, NULL, NULL, mode_clist, NULL, NULL, NULL, NULL, NULL);
+DECLARE_MODULE_AV2(mode, NULL, NULL, mode_clist, NULL, NULL, NULL, NULL, mode_desc);
 
 /*
  * m_mode - MODE command handler
  * parv[1] - channel
  */
-static int
+static void
 m_mode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Channel *chptr = NULL;
@@ -91,7 +94,7 @@ m_mode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
 		{
 			sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
 				   me.name, source_p->name, "MODE");
-			return 0;
+			return;
 		}
 	}
 
@@ -100,13 +103,13 @@ m_mode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
 	{
 		/* if here, it has to be a non-channel name */
 		user_mode(client_p, source_p, parc, parv);
-		return 0;
+		return;
 	}
 
 	if(!check_channel_name(dest))
 	{
 		sendto_one_numeric(source_p, ERR_BADCHANNAME, form_str(ERR_BADCHANNAME), parv[1]);
-		return 0;
+		return;
 	}
 
 	chptr = find_channel(dest);
@@ -115,7 +118,7 @@ m_mode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
 	{
 		sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
 				   form_str(ERR_NOSUCHCHANNEL), parv[1]);
-		return 0;
+		return;
 	}
 
 	/* Now know the channel exists */
@@ -144,11 +147,9 @@ m_mode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
 
 		set_channel_mode(client_p, source_p, chptr, msptr, parc - n, parv + n);
 	}
-
-	return 0;
 }
 
-static int
+static void
 ms_mode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Channel *chptr;
@@ -159,15 +160,13 @@ ms_mode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 	{
 		sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
 				   form_str(ERR_NOSUCHCHANNEL), parv[1]);
-		return 0;
+		return;
 	}
 
 	set_channel_mode(client_p, source_p, chptr, NULL, parc - 2, parv + 2);
-
-	return 0;
 }
 
-static int
+static void
 ms_tmode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Channel *chptr = NULL;
@@ -177,7 +176,7 @@ ms_tmode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 	if(!IsChanPrefix(parv[2][0]) || !check_channel_name(parv[2]))
 	{
 		sendto_one_numeric(source_p, ERR_BADCHANNAME, form_str(ERR_BADCHANNAME), parv[2]);
-		return 0;
+		return;
 	}
 
 	chptr = find_channel(parv[2]);
@@ -186,12 +185,12 @@ ms_tmode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 	{
 		sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
 				   form_str(ERR_NOSUCHCHANNEL), parv[2]);
-		return 0;
+		return;
 	}
 
 	/* TS is higher, drop it. */
 	if(atol(parv[1]) > chptr->channelts)
-		return 0;
+		return;
 
 	if(IsServer(source_p))
 	{
@@ -203,11 +202,9 @@ ms_tmode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 
 		set_channel_mode(client_p, source_p, chptr, msptr, parc - 3, parv + 3);
 	}
-
-	return 0;
 }
 
-static int
+static void
 ms_mlock(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Channel *chptr = NULL;
@@ -216,7 +213,7 @@ ms_mlock(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 	if(!IsChanPrefix(parv[2][0]) || !check_channel_name(parv[2]))
 	{
 		sendto_one_numeric(source_p, ERR_BADCHANNAME, form_str(ERR_BADCHANNAME), parv[2]);
-		return 0;
+		return;
 	}
 
 	chptr = find_channel(parv[2]);
@@ -225,17 +222,15 @@ ms_mlock(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 	{
 		sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
 				   form_str(ERR_NOSUCHCHANNEL), parv[2]);
-		return 0;
+		return;
 	}
 
 	/* TS is higher, drop it. */
 	if(atol(parv[1]) > chptr->channelts)
-		return 0;
+		return;
 
 	if(IsServer(source_p))
-		set_channel_mlock(client_p, source_p, chptr, parv[3], TRUE);
-
-	return 0;
+		set_channel_mlock(client_p, source_p, chptr, parv[3], true);
 }
 
 static void
@@ -253,7 +248,7 @@ possibly_remove_lower_forward(struct Client *fakesource_p, int mems,
 				(actualBan->forward == NULL ||
 				 irccmp(actualBan->forward, forward) < 0))
 		{
-			sendto_channel_local(mems, chptr, ":%s MODE %s -%c %s%s%s",
+			sendto_channel_local(fakesource_p, mems, chptr, ":%s MODE %s -%c %s%s%s",
 					fakesource_p->name,
 					chptr->chname,
 					mchar,
@@ -267,7 +262,7 @@ possibly_remove_lower_forward(struct Client *fakesource_p, int mems,
 	}
 }
 
-static int
+static void
 ms_bmask(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	static char modebuf[BUFSIZE];
@@ -289,14 +284,14 @@ ms_bmask(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 	struct Client *fakesource_p;
 
 	if(!IsChanPrefix(parv[2][0]) || !check_channel_name(parv[2]))
-		return 0;
+		return;
 
 	if((chptr = find_channel(parv[2])) == NULL)
-		return 0;
+		return;
 
 	/* TS is higher, drop it. */
 	if(atol(parv[1]) > chptr->channelts)
-		return 0;
+		return;
 
 	switch (parv[3][0])
 	{
@@ -328,7 +323,7 @@ ms_bmask(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 
 		/* maybe we should just blindly propagate this? */
 	default:
-		return 0;
+		return;
 	}
 
 	parabuf[0] = '\0';
@@ -388,7 +383,7 @@ ms_bmask(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 			{
 				*mbuf = '\0';
 				*(pbuf - 1) = '\0';
-				sendto_channel_local(mems, chptr, "%s %s", modebuf, parabuf);
+				sendto_channel_local(fakesource_p, mems, chptr, "%s %s", modebuf, parabuf);
 
 				mbuf = modebuf + mlen;
 				pbuf = parabuf;
@@ -424,10 +419,9 @@ ms_bmask(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 	{
 		*mbuf = '\0';
 		*(pbuf - 1) = '\0';
-		sendto_channel_local(mems, chptr, "%s %s", modebuf, parabuf);
+		sendto_channel_local(fakesource_p, mems, chptr, "%s %s", modebuf, parabuf);
 	}
 
 	sendto_server(client_p, chptr, CAP_TS6 | needcap, NOCAPS, ":%s BMASK %ld %s %s :%s",
 		      source_p->id, (long) chptr->channelts, chptr->chname, parv[3], parv[4]);
-	return 0;
 }