Alexander Barton : WHO #channel: don't limit list size - ngIRCd GIT Updates

10 Sep 2012

Module: ngircd.git
Branch: master
Commit: 2205227c3b3cbc8788bcf97a037c9e3016f71c9c
URL:    http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=22052...
Author: Alexander Barton alex@barton.de
Date:   Mon Sep 10 12:43:44 2012 +0200
WHO #channel: don't limit list size
It makes no sense to limit the list size when doing WHO for a channel
and not to return all the users in that channel, so I removed the check.
But if there are more than MAX_RPL_WHO(25) replies, the client requesting
the list will be "penalized" one second more (then 2 in total).
This fixes bug #125.
---
src/ngircd/irc-info.c |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index 6ec184a..6eb8d94 100644
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -848,6 +848,8 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps)
    assert( Client != NULL );
    assert( Chan != NULL );
+	IRC_SetPenalty(Client, 1);
+
    is_member = Channel_IsMemberOf(Chan, Client);
/* Secret channel? */
@@ -866,9 +868,6 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps)
is_visible = strchr(client_modes, 'i') == NULL;
    	if (is_member || is_visible) {
-			if (IRC_CheckListTooBig(Client, count, MAX_RPL_WHO, "WHO"))
-				break;
-
    		strcpy(flags, who_flags_status(client_modes));
    		if (is_ircop)
    			strlcat(flags, "*", sizeof(flags));
@@ -883,6 +882,11 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps)
    		count++;
    	}
    }
+
+	/* If there are a lot of clients, augment penalty a bit */
+	if (count > MAX_RPL_WHO)
+		IRC_SetPenalty(Client, 1);
+
    return IRC_WriteStrClient(Client, RPL_ENDOFWHO_MSG, Client_ID(Client),
    			  Channel_Name(Chan));
 }
@@ -911,6 +915,7 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps)
    if (Mask)
    	ngt_LowerStr(Mask);
+	IRC_SetPenalty(Client, 3);
    for (c = Client_First(); c != NULL; c = Client_Next(c)) {
    	if (Client_Type(c) != CLIENT_USER)
    		continue;
@@ -1014,13 +1019,11 @@ IRC_WHO(CLIENT *Client, REQUEST *Req)
    	chan = Channel_Search(Req->argv[0]);
    	if (chan) {
    		/* Members of a channel have been requested */
-			IRC_SetPenalty(Client, 1);
    		return IRC_WHO_Channel(Client, chan, only_ops);
    	}
    	if (strcmp(Req->argv[0], "0") != 0) {
    		/* A mask has been given. But please note this RFC
    		 * stupidity: "0" is same as no arguments ... */
-			IRC_SetPenalty(Client, 3);
    		return IRC_WHO_Mask(Client, Req->argv[0], only_ops);
    	}
    }

    