X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/d5a432fa0092f39dbb517b5665f35dc87e5a88f7..2a003301dea77033af23cb6fcbc94d95fdb93452:/modules/m_info.c

diff --git a/modules/m_info.c b/modules/m_info.c
index 571c4ba..eaf920f 100644
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -29,7 +29,7 @@
 #include "channel.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "hook.h"
 #include "numeric.h"
@@ -91,11 +91,11 @@ static struct InfoStruct info_table[] = {
 		&opers_see_all_users,
 		"Farconnect notices available or operspy accountability limited"
 	},
-	{
-		"max_connections",
-		OUTPUT_DECIMAL,
-		&maxconnections,
-		"Max number connections"
+	{
+		"max_connections",
+		OUTPUT_DECIMAL,
+		&maxconnections,
+		"Max number connections"
 	},
 	{
 		"anti_nick_flood",
@@ -306,7 +306,7 @@ static struct InfoStruct info_table[] = {
 		"min_nonwildcard",
 		OUTPUT_DECIMAL,
 		&ConfigFileEntry.min_nonwildcard,
-		"Minimum non-wildcard chars in K/G lines",
+		"Minimum non-wildcard chars in K lines",
 	},
 	{
 		"min_nonwildcard_simple",
@@ -446,6 +446,18 @@ static struct InfoStruct info_table[] = {
 		&ConfigFileEntry.stats_y_oper_only,
 		"STATS Y is only shown to operators",
 	},
+	{
+		"throttle_count",
+		OUTPUT_DECIMAL,
+		&ConfigFileEntry.throttle_count, 
+		"Connection throttle threshold",
+	},
+	{
+		"throttle_duration",
+		OUTPUT_DECIMAL,
+		&ConfigFileEntry.throttle_duration, 
+		"Connection throttle duration",
+	},
 	{
 		"tkline_expire_notices",
 		OUTPUT_BOOLEAN,
@@ -585,7 +597,6 @@ static struct InfoStruct info_table[] = {
 
 /*
 ** m_info
-**  parv[0] = sender prefix
 **  parv[1] = servername
 */
 static int
@@ -609,7 +620,6 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
 	info_spy(source_p);
 
-	SetCork(source_p);
 	send_info_text(source_p);
 	send_birthdate_online_time(source_p);
 
@@ -619,7 +629,6 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
 /*
 ** mo_info
-**  parv[0] = sender prefix
 **  parv[1] = servername
 */
 static int
@@ -631,7 +640,11 @@ mo_info(struct Client *client_p, struct Client *source_p, int parc, const char *
 		send_info_text(source_p);
 
 		if(IsOper(source_p))
+		{
 			send_conf_options(source_p);
+			sendto_one_numeric(source_p, RPL_INFO, ":%s",
+					rb_lib_version());
+		}
 
 		send_birthdate_online_time(source_p);
 
@@ -671,13 +684,14 @@ send_info_text(struct Client *source_p)
 static void
 send_birthdate_online_time(struct Client *source_p)
 {
+	char tbuf[26]; /* this needs to be 26 - see ctime_r manpage */
 	sendto_one(source_p, ":%s %d %s :Birth Date: %s, compile # %s",
 		   get_id(&me, source_p), RPL_INFO, 
 		   get_id(source_p, source_p), creation, generation);
 
 	sendto_one(source_p, ":%s %d %s :On-line since %s",
 		   get_id(&me, source_p), RPL_INFO, 
-		   get_id(source_p, source_p), myctime(startup_time));
+		   get_id(source_p, source_p), rb_ctime(startup_time, tbuf, sizeof(tbuf)));
 }
 
 /*