X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/bac250f68905ef10f6c0711ef1e9e09352868b70..b2c208be091670e3c5259eba77187bae6ac6eece:/modules/m_who.c

diff --git a/modules/m_who.c b/modules/m_who.c
index 718ed094..8bb05afe 100644
--- a/modules/m_who.c
+++ b/modules/m_who.c
@@ -40,6 +40,7 @@
 #include "modules.h"
 #include "packet.h"
 #include "s_newconf.h"
+#include "ratelimit.h"
 
 #define FIELD_CHANNEL    0x0001
 #define FIELD_HOP        0x0002
@@ -84,7 +85,6 @@ static void do_who(struct Client *source_p,
 
 /*
 ** m_who
-**      parv[0] = sender prefix
 **      parv[1] = nickname mask list
 **      parv[2] = additional selection flag and format options
 */
@@ -178,8 +178,18 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa
 	{
 		/* List all users on a given channel */
 		chptr = find_channel(parv[1] + operspy);
+
 		if(chptr != NULL)
 		{
+			if (!IsOper(source_p) && !ratelimit_client_who(source_p, rb_dlink_list_length(&chptr->members)/50))
+			{
+				sendto_one(source_p, form_str(RPL_LOAD2HI),
+						me.name, source_p->name, "WHO");
+				sendto_one(source_p, form_str(RPL_ENDOFWHO),
+					   me.name, source_p->name, "*");
+				return 0;
+			}
+
 			if(operspy)
 				report_operspy(source_p, "WHO", chptr->chname);
 
@@ -188,6 +198,7 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa
 			else if(!SecretChannel(chptr))
 				do_who_on_channel(source_p, chptr, server_oper, NO, &fmt);
 		}
+
 		sendto_one(source_p, form_str(RPL_ENDOFWHO),
 			   me.name, source_p->name, parv[1] + operspy);
 		return 0;
@@ -234,7 +245,7 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa
 	/* it has to be a global who at this point, limit it */
 	if(!IsOper(source_p))
 	{
-		if((last_used + ConfigFileEntry.pace_wait) > rb_current_time())
+		if((last_used + ConfigFileEntry.pace_wait) > rb_current_time() || !ratelimit_client(source_p, 1))
 		{
 			sendto_one(source_p, form_str(RPL_LOAD2HI),
 					me.name, source_p->name, "WHO");
@@ -443,7 +454,7 @@ append_format(char *buf, size_t bufsize, size_t *pos, const char *fmt, ...)
 
 	max = *pos >= bufsize ? 0 : bufsize - *pos;
 	va_start(ap, fmt);
-	result = rb_vsnprintf(buf + *pos, bufsize - *pos, fmt, ap);
+	result = rb_vsnprintf(buf + *pos, max, fmt, ap);
 	va_end(ap);
 	*pos += result;
 }
@@ -475,7 +486,7 @@ do_who(struct Client *source_p, struct Client *target_p, struct membership *mspt
 			   source_p->name, msptr ? msptr->chptr->chname : "*",
 			   target_p->username, target_p->host,
 			   target_p->servptr->name, target_p->name, status,
-			   ConfigServerHide.flatten_links ? 0 : target_p->hopcount, 
+			   ConfigServerHide.flatten_links && !IsOper(source_p) && !IsExemptShide(source_p) ? 0 : target_p->hopcount, 
 			   target_p->info);
 	else
 	{
@@ -505,7 +516,7 @@ do_who(struct Client *source_p, struct Client *target_p, struct membership *mspt
 		if (fmt->fields & FIELD_FLAGS)
 			append_format(str, sizeof str, &pos, " %s", status);
 		if (fmt->fields & FIELD_HOP)
-			append_format(str, sizeof str, &pos, " %d", ConfigServerHide.flatten_links ? 0 : target_p->hopcount);
+			append_format(str, sizeof str, &pos, " %d", ConfigServerHide.flatten_links && !IsOper(source_p) && !IsExemptShide(source_p) ? 0 : target_p->hopcount);
 		if (fmt->fields & FIELD_IDLE)
 			append_format(str, sizeof str, &pos, " %d", (int)(MyClient(target_p) ? rb_current_time() - target_p->localClient->last : 0));
 		if (fmt->fields & FIELD_ACCOUNT)