X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/f4ed5745de77705dd9eecf39030c8be5f78516c2..24170ac312f9e042993a5377ed82769f4ae74e55:/modules/m_set.c

diff --git a/modules/m_set.c b/modules/m_set.c
index 342e1de..88e079a 100644
--- a/modules/m_set.c
+++ b/modules/m_set.c
@@ -28,12 +28,9 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "event.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_serv.h"
 #include "send.h"
 #include "common.h"
@@ -58,7 +55,7 @@ DECLARE_MODULE_AV1(set, NULL, NULL, set_clist, NULL, NULL, "$Revision: 3406 $");
 struct SetStruct
 {
 	const char *name;
-	void (*handler) ();
+	void (*handler)(struct Client *source_p, const char *chararg, int intarg);
 	int wants_char;		/* 1 if it expects (char *, [int]) */
 	int wants_int;		/* 1 if it expects ([char *], int) */
 
@@ -67,19 +64,19 @@ struct SetStruct
 };
 
 
-static void quote_adminstring(struct Client *, const char *);
-static void quote_autoconn(struct Client *, char *, int);
-static void quote_autoconnall(struct Client *, int);
-static void quote_floodcount(struct Client *, int);
-static void quote_identtimeout(struct Client *, int);
-static void quote_idletime(struct Client *, int);
-static void quote_max(struct Client *, int);
-static void quote_operstring(struct Client *, const char *);
-static void quote_spamnum(struct Client *, int);
-static void quote_spamtime(struct Client *, int);
-static void quote_splitmode(struct Client *, char *);
-static void quote_splitnum(struct Client *, int);
-static void quote_splitusers(struct Client *, int);
+static void quote_adminstring(struct Client *, const char *, int);
+static void quote_autoconn(struct Client *, const char *, int);
+static void quote_autoconnall(struct Client *, const char *, int);
+static void quote_floodcount(struct Client *, const char *, int);
+static void quote_identtimeout(struct Client *, const char *, int);
+static void quote_max(struct Client *, const char *, int);
+static void quote_operstring(struct Client *, const char *, int);
+static void quote_spamnum(struct Client *, const char *, int);
+static void quote_spamtime(struct Client *, const char *, int);
+static void quote_splitmode(struct Client *, const char *, int);
+static void quote_splitnum(struct Client *, const char *, int);
+static void quote_splitusers(struct Client *, const char *, int);
+
 static void list_quote_commands(struct Client *);
 
 
@@ -99,7 +96,6 @@ static struct SetStruct set_cmd_table[] = {
 	{"AUTOCONNALL", quote_autoconnall, 	0,	1	},
 	{"FLOODCOUNT", 	quote_floodcount, 	0,	1	},
 	{"IDENTTIMEOUT", quote_identtimeout,	0,	1	},
-	{"IDLETIME", 	quote_idletime, 	0,	1	},
 	{"MAX", 	quote_max, 		0,	1	},
 	{"MAXCLIENTS",	quote_max,		0,	1	},
 	{"OPERSTRING",	quote_operstring,	1,	0	},
@@ -109,7 +105,7 @@ static struct SetStruct set_cmd_table[] = {
 	{"SPLITNUM", 	quote_splitnum, 	0,	1	},
 	{"SPLITUSERS", 	quote_splitusers, 	0,	1	},
 	/* -------------------------------------------------------- */
-	{(char *) 0, (void (*)()) 0, 0, 0}
+	{(char *) 0, (void (*)(struct Client *, const char *, int)) 0, 0, 0}
 };
 
 
@@ -148,14 +144,14 @@ list_quote_commands(struct Client *source_p)
 
 /* SET AUTOCONN */
 static void
-quote_autoconn(struct Client *source_p, char *arg, int newval)
+quote_autoconn(struct Client *source_p, const char *arg, int newval)
 {
 	set_server_conf_autoconn(source_p, arg, newval);
 }
 
 /* SET AUTOCONNALL */
 static void
-quote_autoconnall(struct Client *source_p, int newval)
+quote_autoconnall(struct Client *source_p, const char *arg, int newval)
 {
 	if(newval >= 0)
 	{
@@ -174,7 +170,7 @@ quote_autoconnall(struct Client *source_p, int newval)
 
 /* SET FLOODCOUNT */
 static void
-quote_floodcount(struct Client *source_p, int newval)
+quote_floodcount(struct Client *source_p, const char *arg, int newval)
 {
 	if(newval >= 0)
 	{
@@ -192,7 +188,7 @@ quote_floodcount(struct Client *source_p, int newval)
 
 /* SET IDENTTIMEOUT */
 static void
-quote_identtimeout(struct Client *source_p, int newval)
+quote_identtimeout(struct Client *source_p, const char *arg, int newval)
 {
 	if(!IsOperAdmin(source_p))
 	{
@@ -213,51 +209,24 @@ quote_identtimeout(struct Client *source_p, int newval)
 			   GlobalSetOptions.ident_timeout);
 }
 
-/* SET IDLETIME */
-static void
-quote_idletime(struct Client *source_p, int newval)
-{
-	if(newval >= 0)
-	{
-		if(newval == 0)
-		{
-			sendto_realops_snomask(SNO_GENERAL, L_ALL,
-					     "%s has disabled idletime checking", source_p->name);
-			GlobalSetOptions.idletime = 0;
-		}
-		else
-		{
-			sendto_realops_snomask(SNO_GENERAL, L_ALL,
-					     "%s has changed IDLETIME to %i",
-					     source_p->name, newval);
-			GlobalSetOptions.idletime = (newval * 60);
-		}
-	}
-	else
-	{
-		sendto_one_notice(source_p, ":IDLETIME is currently %i",
-			GlobalSetOptions.idletime / 60);
-	}
-}
-
 /* SET MAX */
 static void
-quote_max(struct Client *source_p, int newval)
+quote_max(struct Client *source_p, const char *arg, int newval)
 {
 	if(newval > 0)
 	{
-		if(newval > ServerInfo.max_clients)
+		if(newval > maxconnections - MAX_BUFFER)
 		{
 			sendto_one_notice(source_p,
-				   ":You cannot set MAXCLIENTS to > max_clients (%d)",
-				   ServerInfo.max_clients);
+					  ":You cannot set MAXCLIENTS to > %d",
+					  maxconnections - MAX_BUFFER);
 			return;
 		}
 
 		if(newval < 32)
 		{
 			sendto_one_notice(source_p, ":You cannot set MAXCLIENTS to < 32 (%d:%d)",
-				   GlobalSetOptions.maxclients, highest_fd);
+				   GlobalSetOptions.maxclients, rb_getmaxconnect());
 			return;
 		}
 
@@ -267,20 +236,20 @@ quote_max(struct Client *source_p, int newval)
 				     "%s!%s@%s set new MAXCLIENTS to %d (%lu current)",
 				     source_p->name, source_p->username, source_p->host,
 				     GlobalSetOptions.maxclients, 
-				     dlink_list_length(&lclient_list));
+				     rb_dlink_list_length(&lclient_list));
 
 		return;
 	}
 	else
 	{
 		sendto_one_notice(source_p, ":Current Maxclients = %d (%lu)",
-			   GlobalSetOptions.maxclients, dlink_list_length(&lclient_list));
+			   GlobalSetOptions.maxclients, rb_dlink_list_length(&lclient_list));
 	}
 }
 
 /* SET OPERSTRING */
 static void
-quote_operstring(struct Client *source_p, const char *arg)
+quote_operstring(struct Client *source_p, const char *arg, int newval)
 {
 	if(EmptyString(arg))
 	{
@@ -288,7 +257,7 @@ quote_operstring(struct Client *source_p, const char *arg)
 	}
 	else
 	{
-		strlcpy(GlobalSetOptions.operstring, arg,
+		rb_strlcpy(GlobalSetOptions.operstring, arg,
 			sizeof(GlobalSetOptions.operstring));
 		
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
@@ -299,7 +268,7 @@ quote_operstring(struct Client *source_p, const char *arg)
 
 /* SET ADMINSTRING */
 static void
-quote_adminstring(struct Client *source_p, const char *arg)
+quote_adminstring(struct Client *source_p, const char *arg, int newval)
 {
 	if(EmptyString(arg))
 	{
@@ -307,7 +276,7 @@ quote_adminstring(struct Client *source_p, const char *arg)
 	}
 	else
 	{
-		strlcpy(GlobalSetOptions.adminstring, arg,
+		rb_strlcpy(GlobalSetOptions.adminstring, arg,
 			sizeof(GlobalSetOptions.adminstring));
 		
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
@@ -318,7 +287,7 @@ quote_adminstring(struct Client *source_p, const char *arg)
 
 /* SET SPAMNUM */
 static void
-quote_spamnum(struct Client *source_p, int newval)
+quote_spamnum(struct Client *source_p, const char *arg, int newval)
 {
 	if(newval > 0)
 	{
@@ -348,7 +317,7 @@ quote_spamnum(struct Client *source_p, int newval)
 
 /* SET SPAMTIME */
 static void
-quote_spamtime(struct Client *source_p, int newval)
+quote_spamtime(struct Client *source_p, const char *arg, int newval)
 {
 	if(newval > 0)
 	{
@@ -388,7 +357,7 @@ static const char *splitmode_status[] = {
 
 /* SET SPLITMODE */
 static void
-quote_splitmode(struct Client *source_p, char *charval)
+quote_splitmode(struct Client *source_p, const char *charval, int intval)
 {
 	if(charval)
 	{
@@ -409,7 +378,8 @@ quote_splitmode(struct Client *source_p, char *charval)
 			splitmode = 0;
 			splitchecking = 0;
 
-			eventDelete(check_splitmode, NULL);
+			rb_event_delete(check_splitmode_ev);
+			check_splitmode_ev = NULL;
 		}
 		/* ON */
 		else if(newval == 1)
@@ -422,7 +392,8 @@ quote_splitmode(struct Client *source_p, char *charval)
 			splitchecking = 0;
 
 			/* we might be deactivating an automatic splitmode, so pull the event */
-			eventDelete(check_splitmode, NULL);
+			rb_event_delete(check_splitmode_ev);
+			check_splitmode_ev = NULL;
 		}
 		/* AUTO */
 		else if(newval == 2)
@@ -446,7 +417,7 @@ quote_splitmode(struct Client *source_p, char *charval)
 
 /* SET SPLITNUM */
 static void
-quote_splitnum(struct Client *source_p, int newval)
+quote_splitnum(struct Client *source_p, const char *arg, int newval)
 {
 	if(newval >= 0)
 	{
@@ -463,7 +434,7 @@ quote_splitnum(struct Client *source_p, int newval)
 
 /* SET SPLITUSERS */
 static void
-quote_splitusers(struct Client *source_p, int newval)
+quote_splitusers(struct Client *source_p, const char *arg, int newval)
 {
 	if(newval >= 0)
 	{
@@ -564,24 +535,8 @@ mo_set(struct Client *client_p, struct Client *source_p, int parc, const char *p
 				else
 					newval = -1;
 
-				if(set_cmd_table[i].wants_char)
-				{
-					if(set_cmd_table[i].wants_int)
-						set_cmd_table[i].handler(source_p, arg, newval);
-					else
-						set_cmd_table[i].handler(source_p, arg);
-					return 0;
-				}
-				else
-				{
-					if(set_cmd_table[i].wants_int)
-						set_cmd_table[i].handler(source_p, newval);
-					else
-						/* Just in case someone actually wants a
-						 * set function that takes no args.. *shrug* */
-						set_cmd_table[i].handler(source_p);
-					return 0;
-				}
+				set_cmd_table[i].handler(source_p, arg, newval);
+				return 0;
 			}
 		}