Module: ngircd.git Branch: master Commit: d4d8102fc99a57e2b1f6604f8a5956c33e88bf2c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d4d81...

Author: Alexander Barton alex@barton.de Date: Fri Jan 13 10:43:05 2012 +0100

Don't stop join handling on faulty channel, skip it (part #2)

Commit 565523cb allowed processing of further channel names given to the JOIN command when a single name was invalid.

After this patch, the JOIN command handler continues to process channel name lists even after errors like "channel is full", "too many channels", and the like and generates appropriate error messages for all the channels given by the client.

---

src/ngircd/irc-channel.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 196b547..77deed7 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -364,7 +364,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) /* channel must be created, but forbidden by config */ IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, Client_ID(Client), channame); - break; + goto join_next; }

/* Local client? */ @@ -377,15 +377,19 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )

/* Test if the user has reached the channel limit */ if ((Conf_MaxJoins > 0) && - (Channel_CountForUser(Client) >= Conf_MaxJoins)) - return IRC_WriteStrClient(Client, + (Channel_CountForUser(Client) >= Conf_MaxJoins)) { + if (!IRC_WriteStrClient(Client, ERR_TOOMANYCHANNELS_MSG, - Client_ID(Client), channame); + Client_ID(Client), channame)) + return DISCONNECTED; + goto join_next; + } + if (chan) { /* Already existing channel: check if the * client is allowed to join */ if (!join_allowed(Client, chan, channame, key)) - break; + goto join_next; } else { /* New channel: first user will become channel * operator unless this is a modeless channel */