ngIRCd GIT Updates Januar 2012

ngircd-commits@lists.barton.de

2 Teilnehmer
75 Diskussionen

Alexander Barton : Make Send_ListChange() a little bit more generic
by alex＠arthur.barton.de 16 Jan '12

16 Jan '12

Module: ngircd.git Branch: master Commit: 1afbf7123635fde41953a5791bed247b12540b63 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1afbf712… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 16 00:15:26 2012 +0100 Make Send_ListChange() a little bit more generic --- src/ngircd/irc-mode.c | 101 +++++++++++++++++++++++++++++-------------------- 1 files changed, 60 insertions(+), 41 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/… [View More]irc-mode.c index 0340d3f..bb78bcb 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -36,18 +36,19 @@ #include "irc-mode.h" -static bool Client_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, - CLIENT *Target )); -static bool Channel_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, - CHANNEL *Channel )); +static bool Client_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin, + CLIENT *Target)); +static bool Channel_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin, + CHANNEL *Channel)); -static bool Add_Ban_Invite PARAMS((int what, CLIENT *Prefix, CLIENT *Client, - CHANNEL *Channel, const char *Pattern)); -static bool Del_Ban_Invite PARAMS((int what, CLIENT *Prefix, CLIENT *Client, - CHANNEL *Channel, const char *Pattern)); +static bool Add_Ban_Invite PARAMS((char what, CLIENT *Prefix, CLIENT *Client, + CHANNEL *Channel, const char *Pattern)); +static bool Del_Ban_Invite PARAMS((char what, CLIENT *Prefix, CLIENT *Client, + CHANNEL *Channel, const char *Pattern)); -static bool Send_ListChange PARAMS((const char *Mode, CLIENT *Prefix, - CLIENT *Client, CHANNEL *Channel, const char *Mask)); +static bool Send_ListChange PARAMS((const bool IsAdd, const char ModeChar, + CLIENT *Prefix, CLIENT *Client, + CHANNEL *Channel, const char *Mask)); /** @@ -842,10 +843,11 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req ) * @return CONNECTED or DISCONNECTED. */ static bool -Add_Ban_Invite(int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, +Add_Ban_Invite(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Pattern) { const char *mask; + struct list_head *list; assert(Client != NULL); assert(Channel != NULL); @@ -854,19 +856,22 @@ Add_Ban_Invite(int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, mask = Lists_MakeMask(Pattern); + if (what == 'I') + list = Channel_GetListInvites(Channel); + else + list = Channel_GetListBans(Channel); + + if (Lists_CheckDupeMask(list, mask)) + return CONNECTED; + if (what == 'I') { - if (Lists_CheckDupeMask(Channel_GetListInvites(Channel), mask)) - return CONNECTED; if (!Channel_AddInvite(Channel, mask, false)) return CONNECTED; - return Send_ListChange("+I", Prefix, Client, Channel, mask); } else { - if (Lists_CheckDupeMask(Channel_GetListBans(Channel), mask)) - return CONNECTED; if (!Channel_AddBan(Channel, mask)) return CONNECTED; - return Send_ListChange("+b", Prefix, Client, Channel, mask); } + return Send_ListChange(true, what, Prefix, Client, Channel, mask); } @@ -881,10 +886,11 @@ Add_Ban_Invite(int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, * @return CONNECTED or DISCONNECTED. */ static bool -Del_Ban_Invite(int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, +Del_Ban_Invite(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Pattern) { const char *mask; + struct list_head *list; assert(Client != NULL); assert(Channel != NULL); @@ -893,40 +899,53 @@ Del_Ban_Invite(int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, mask = Lists_MakeMask(Pattern); - if (what == 'I') { - if (!Lists_CheckDupeMask(Channel_GetListInvites(Channel), mask)) - return CONNECTED; - Lists_Del(Channel_GetListInvites(Channel), mask); - return Send_ListChange( "-I", Prefix, Client, Channel, mask ); - } else { - if (!Lists_CheckDupeMask(Channel_GetListBans(Channel), mask)) - return CONNECTED; - Lists_Del(Channel_GetListBans(Channel), mask); - return Send_ListChange( "-b", Prefix, Client, Channel, mask ); - } + if (what == 'I') + list = Channel_GetListInvites(Channel); + else + list = Channel_GetListBans(Channel); + + if (!Lists_CheckDupeMask(list, mask)) + return CONNECTED; + Lists_Del(list, mask); + return Send_ListChange(false, what, Prefix, Client, Channel, mask); } +/** + * Send information about changed channel ban/invite lists to clients. + * + * @param IsAdd true if the list item has been added, false otherwise. + * @param ModeChar The mode to use (e. g. 'b' or 'I') + * @param Prefix The originator of the mode list change. + * @param Client The sender of the command. + * @param Channel The channel of which the list has been modified. + * @param Mask The mask which has been added or removed. + * @return CONNECTED or DISCONNECTED. + */ static bool -Send_ListChange(const char *Mode, CLIENT *Prefix, CLIENT *Client, - CHANNEL *Channel, const char *Mask) +Send_ListChange(const bool IsAdd, const char ModeChar, CLIENT *Prefix, + CLIENT *Client, CHANNEL *Channel, const char *Mask) { - bool ok; + bool ok = true; - if( Client_Type( Client ) == CLIENT_USER ) - { - /* send confirmation to client */ - ok = IRC_WriteStrClientPrefix( Client, Prefix, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask ); - } - else ok = true; + /* Send confirmation to the client */ + if (Client_Type(Client) == CLIENT_USER) + ok = IRC_WriteStrClientPrefix(Client, Prefix, "MODE %s %c%c %s", + Channel_Name(Channel), + IsAdd ? '+' : '-', + ModeChar, Mask); /* to other servers */ - IRC_WriteStrServersPrefix( Client, Prefix, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask ); + IRC_WriteStrServersPrefix(Client, Prefix, "MODE %s %c%c %s", + Channel_Name(Channel), IsAdd ? '+' : '-', + ModeChar, Mask); /* and local users in channel */ - IRC_WriteStrChannelPrefix( Client, Channel, Prefix, false, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask ); - + IRC_WriteStrChannelPrefix(Client, Channel, Prefix, false, + "MODE %s %c%c %s", Channel_Name(Channel), + IsAdd ? '+' : '-', ModeChar, Mask ); + return ok; } /* Send_ListChange */ [View Less]

1 0

Alexander Barton : Channel lists: Fix duplicate check and error messages
by alex＠arthur.barton.de 15 Jan '12

15 Jan '12

Module: ngircd.git Branch: master Commit: 81cc5f82b50de80bff9d2d1c37fc726baea5fac5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=81cc5f82… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 15 19:07:15 2012 +0100 Channel lists: Fix duplicate check and error messages - Check correct list for duplicates when adding items. - Don't generate any messages when adding duplicates or removing non-existing items (this is how ircd-seven and ircu … [View More]behave). - Code cleanup: Add_Ban_Invite(), Del_Ban_Invite(). --- src/ngircd/irc-mode.c | 86 ++++++++++++++++++++++++++++++------------------- 1 files changed, 53 insertions(+), 33 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 82e6a5a..0340d3f 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -831,60 +831,80 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req ) } /* IRC_AWAY */ +/** + * Add entries to channel ban and invite lists. + * + * @param what Can be 'I' for invite or 'b' for ban list. + * @param Prefix The originator of the command. + * @param Client The sender of the command. + * @param Channel The channel of which the list should be modified. + * @param Pattern The pattern to add to the list. + * @return CONNECTED or DISCONNECTED. + */ static bool -Add_Ban_Invite(int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Pattern) +Add_Ban_Invite(int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, + const char *Pattern) { const char *mask; - bool already; - bool ret; - assert( Client != NULL ); - assert( Channel != NULL ); - assert( Pattern != NULL ); + assert(Client != NULL); + assert(Channel != NULL); + assert(Pattern != NULL); assert(what == 'I' || what == 'b'); mask = Lists_MakeMask(Pattern); - already = Lists_CheckDupeMask(Channel_GetListInvites(Channel), mask); - if (!already) { - if (what == 'I') - ret = Channel_AddInvite(Channel, mask, false); - else - ret = Channel_AddBan(Channel, mask); - if (!ret) + if (what == 'I') { + if (Lists_CheckDupeMask(Channel_GetListInvites(Channel), mask)) + return CONNECTED; + if (!Channel_AddInvite(Channel, mask, false)) return CONNECTED; - } - if (already && (Client_Type(Prefix) == CLIENT_SERVER)) - return CONNECTED; - - if (what == 'I') return Send_ListChange("+I", Prefix, Client, Channel, mask); - return Send_ListChange("+b", Prefix, Client, Channel, mask); + } else { + if (Lists_CheckDupeMask(Channel_GetListBans(Channel), mask)) + return CONNECTED; + if (!Channel_AddBan(Channel, mask)) + return CONNECTED; + return Send_ListChange("+b", Prefix, Client, Channel, mask); + } } +/** + * Delete entries from channel ban and invite lists. + * + * @param what Can be 'I' for invite or 'b' for ban list. + * @param Prefix The originator of the command. + * @param Client The sender of the command. + * @param Channel The channel of which the list should be modified. + * @param Pattern The pattern to add to the list. + * @return CONNECTED or DISCONNECTED. + */ static bool -Del_Ban_Invite(int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Pattern) +Del_Ban_Invite(int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, + const char *Pattern) { const char *mask; - struct list_head *list; - assert( Client != NULL ); - assert( Channel != NULL ); - assert( Pattern != NULL ); + assert(Client != NULL); + assert(Channel != NULL); + assert(Pattern != NULL); assert(what == 'I' || what == 'b'); - mask = Lists_MakeMask( Pattern ); - - if (what == 'I') - list = Channel_GetListInvites(Channel); - else - list = Channel_GetListBans(Channel); + mask = Lists_MakeMask(Pattern); - Lists_Del(list, mask); - if (what == 'I') + if (what == 'I') { + if (!Lists_CheckDupeMask(Channel_GetListInvites(Channel), mask)) + return CONNECTED; + Lists_Del(Channel_GetListInvites(Channel), mask); return Send_ListChange( "-I", Prefix, Client, Channel, mask ); - return Send_ListChange( "-b", Prefix, Client, Channel, mask ); + } else { + if (!Lists_CheckDupeMask(Channel_GetListBans(Channel), mask)) + return CONNECTED; + Lists_Del(Channel_GetListBans(Channel), mask); + return Send_ListChange( "-b", Prefix, Client, Channel, mask ); + } + } [View Less]

1 0

Alexander Barton : Don' t enforce MAX_HNDL_MODES_ARG on server and service links
by alex＠arthur.barton.de 15 Jan '12

15 Jan '12

Module: ngircd.git Branch: master Commit: 78a3b4c7d64e87845d6babef9a4d1619f9691aba URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=78a3b4c7… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 15 14:33:04 2012 +0100 Don't enforce MAX_HNDL_MODES_ARG on server and service links --- src/ngircd/irc-mode.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c … [View More]

1 0

Alexander Barton : Update documentation (fix some URL, update some info)
by alex＠arthur.barton.de 14 Jan '12

14 Jan '12

Module: ngircd.git Branch: master Commit: 39d630c00d5b4680642d52463284e3282c2303ac URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=39d630c0… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 14 12:29:53 2012 +0100 Update documentation (fix some URL, update some info) --- AUTHORS | 7 ++++--- README | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/AUTHORS b/AUTHORS index 241d3a4..986beef 100644 --- a/AUTHORS +++… [View More]

1 0

Alexander Barton : Update NEWS and ChangeLog for next ngIRCd release once more
by alex＠arthur.barton.de 13 Jan '12

13 Jan '12

Module: ngircd.git Branch: master Commit: 4fe6b42c53eb483f4a6accadb41b362f1eca7841 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4fe6b42c… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 13 19:23:07 2012 +0100 Update NEWS and ChangeLog for next ngIRCd release once more --- ChangeLog | 36 ++++++++++++++++++++++++++++++++++++ NEWS | 10 ++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog … [View More]index e7cbcdd..3d7606b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,42 @@ ngIRCd Release 19 + - MODE command: correctly return ERR_UNKNOWNMODE(472) numeric for + unknown channel modes, instead of ERR_UMODEUNKNOWNFLAG(501). + - ISUPPORT(005) numeric: add "O", "R", and "z" modes to "CHANMODES". + - Limit the number of list items in the reply of LIST (100), WHO (25), + WHOIS (10), and WHOWAS (25) commands. + - LIST command: compare pattern case insensitive. + - Limit the MODE command to handle a maximum number of 5 channel modes + that require an argument (+Ibkl) per call and report this number + in the ISUPPORT(005) numeric: "MODES=5". + - Fix handling of channel mode sequence with/without arguments. + For example, don't generate wrong error messages when handling + "MODE #chan +IIIIItn *!aa@b *!bb@c *!cc@d *!dd@e *!ee@f". + - When sending data on a connection, only try to get the type of + the client if there still is one assigned. This could trigger an + assertion and end the daemon in some error paths. + - Don't try to close already closed/invalid sockets to forked child + processes. This could potentially crash the daemon in some cases + with IDENT lookups enabled. + - WHOIS command: make sure that the reply ends with RPL_ENDOFWHOIS, + don't answer queries for IRC servers, make sure mask matching is + case-insensitive, and that RPL_ENDOFWHOIS numeric is sent with the + unmodified mask (like it has been received from the client). + - LINKS command: support <mask> parameter to limit the reply. + - Add 1 second penalty for every further target on PRIVMSG/NOTICE + commands: this reduces the possibility of flooding channels with + commands like "PRIVMSG/NOTICE #a,#n,#c,... :message" a little bit. + Problem noticed by Cahata, thanks! + - Display correct error message when "Server{UID|GID}" variabe in the + configuration file is invalid (not a number and no existing user). + - Update Copyright notices for 2012 :-) + - JOIN command: don't stop handling of channel lists when a single + channel cannot be joined (because of bad name, wrong key or channel + limit reached), but report an error and continue. And don't check + the channel limit and don't report with "too many channels" when + trying to join a channel that the client already is a member of. + - ISON command: reply with the correct upper-/lowercase nick names. - New configuration option "PAMIsOptional": when set, clients not sending a password are still allowed to connect: they won't become "identified" and keep the "~" character prepended to their supplied diff --git a/NEWS b/NEWS index d44b4a8..523db0f 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,16 @@ ngIRCd Release 19 + - Limit the number of list items in the reply of LIST (100), WHO (25), + WHOIS (10), and WHOWAS (25) commands. + - Limit the MODE command to handle a maximum number of 5 channel modes + that require an argument (+Ibkl) per call and report this number + in the ISUPPORT(005) numeric: "MODES=5". + - LINKS command: support <mask> parameter to limit the reply. + - Add 1 second penalty for every further target on PRIVMSG/NOTICE + commands: this reduces the possibility of flooding channels with + commands like "PRIVMSG/NOTICE #a,#n,#c,... :message" a little bit. + Problem noticed by Cahata, thanks! - New configuration option "PAMIsOptional": when set, clients not sending a password are still allowed to connect: they won't become "identified" and keep the "~" character prepended to their supplied [View Less]

1 0

Alexander Barton : JOIN command: don' t check channel limit if already member
by alex＠arthur.barton.de 13 Jan '12

13 Jan '12

Module: ngircd.git Branch: master Commit: 77f68b4fd140404848e203a6634ecd472294723f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=77f68b4f… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 13 10:40:20 2012 +0100 JOIN command: don't check channel limit if already member Don't check the channel limit and don't report "too many channels" when trying to join a channel that the client is already a member of. --- src/ngircd/irc-channel.c | 6 ++… [View More]

1 0

Alexander Barton : Don't stop join handling on faulty channel, skip it ( part #2)
by alex＠arthur.barton.de 13 Jan '12

13 Jan '12

Module: ngircd.git Branch: master Commit: d4d8102fc99a57e2b1f6604f8a5956c33e88bf2c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d4d8102f… Author: Alexander Barton <alex(a)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 … [View More]

1 0

Alexander Barton : Return ERR_UNKNOWNMODE(472) for unknown channel modes
by alex＠arthur.barton.de 09 Jan '12

09 Jan '12

Module: ngircd.git Branch: master Commit: 2f8877ded4f0831a2f6033c589fcd36d9cecd0ba URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2f8877de… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 9 23:18:39 2012 +0100 Return ERR_UNKNOWNMODE(472) for unknown channel modes The daemon reported ERR_UMODEUNKNOWNFLAG(501), which is wrong. --- src/ngircd/irc-mode.c | 6 +++--- src/ngircd/messages.h | 2 +- 2 files changed, 4 insertions(+), 4 … [View More]

1 0

Alexander Barton : Numberic 005 (ISUPPORT), CHANMODES: add "O", "R", "z" modes
by alex＠arthur.barton.de 09 Jan '12

09 Jan '12

Module: ngircd.git Branch: master Commit: 4bff3daf92f59c61cb43995118875a33580b81e3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4bff3daf… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 9 12:34:55 2012 +0100 Numberic 005 (ISUPPORT), CHANMODES: add "O", "R", "z" modes --- src/ngircd/messages.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index cf11ca5..f06cf86 … [View More]

1 0

Alexander Barton : Limit list replies of LIST, WHO, WHOIS, and MAX_RPL_WHOWAS
by alex＠arthur.barton.de 06 Jan '12

06 Jan '12

Module: ngircd.git Branch: master Commit: c5beca8aabab6d1822f63e86e5db02649d7b1a41 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c5beca8a… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 6 20:06:25 2012 +0100 Limit list replies of LIST, WHO, WHOIS, and MAX_RPL_WHOWAS Introduce new #define's MAX_RPL_LIST(100), MAX_RPL_WHO(25), MAX_RPL_WHOIS(10), and MAX_RPL_WHOWAS(25). --- src/ngircd/defines.h | 18 +++++++++++++++--- src/ngircd/irc-… [View More]channel.c | 8 ++++++++ src/ngircd/irc-info.c | 23 +++++++++++++++++++---- 3 files changed, 42 insertions(+), 7 deletions(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 2613a35..e758668 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -178,12 +178,24 @@ /* Defaults and limits for IRC commands */ -/** Default count of WHOWAS command replies */ -#define DEF_RPL_WHOWAS 5 +/** Max. number of LIST replies. */ +#define MAX_RPL_LIST 100 -/** Max. number of channel modes with arguments per MODE command */ +/** Max. number of channel modes with arguments per MODE command. */ #define MAX_HNDL_MODES_ARG 5 +/** Max. number of WHO replies. */ +#define MAX_RPL_WHO 25 + +/** Max. number of WHOIS replies. */ +#define MAX_RPL_WHOIS 10 + +/** Default count of WHOWAS command replies. */ +#define DEF_RPL_WHOWAS 5 + +/** Max count of WHOWAS command replies. */ +#define MAX_RPL_WHOWAS 25 + #endif diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 94a8a4d..52ba093 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -31,6 +31,7 @@ #include "match.h" #include "messages.h" #include "parse.h" +#include "irc.h" #include "irc-info.h" #include "irc-write.h" #include "conf.h" @@ -602,6 +603,7 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) char *pattern; CHANNEL *chan; CLIENT *from, *target; + int count = 0; assert(Client != NULL); assert(Req != NULL); @@ -654,12 +656,17 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) /* Gotcha! */ if (!strchr(Channel_Modes(chan), 's') || Channel_IsMemberOf(chan, from)) { + if (IRC_CheckListTooBig(from, count, + MAX_RPL_LIST, + "LIST")) + break; if (!IRC_WriteStrClient(from, RPL_LIST_MSG, Client_ID(from), Channel_Name(chan), Channel_MemberCount(chan), Channel_Topic( chan ))) return DISCONNECTED; + count++; } } chan = Channel_Next(chan); @@ -672,6 +679,7 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) pattern = NULL; } + IRC_SetPenalty(from, 2); return IRC_WriteStrClient(from, RPL_LISTEND_MSG, Client_ID(from)); } /* IRC_LIST */ diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 8c87d93..fd4cbee 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -37,6 +37,7 @@ #include "match.h" #include "tool.h" #include "parse.h" +#include "irc.h" #include "irc-write.h" #include "exp.h" @@ -833,6 +834,7 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps) const char *chan_user_modes; char flags[8]; CLIENT *c; + int count = 0; assert( Client != NULL ); assert( Chan != NULL ); @@ -855,6 +857,9 @@ 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)); @@ -866,6 +871,7 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps) if (!write_whoreply(Client, c, Channel_Name(Chan), flags)) return DISCONNECTED; + count++; } } return IRC_WriteStrClient(Client, RPL_ENDOFWHO_MSG, Client_ID(Client), @@ -889,6 +895,7 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps) CHANNEL *chan; bool client_match, is_visible; char flags[4]; + int count = 0; assert (Client != NULL); @@ -939,13 +946,16 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps) if (!is_visible) /* target user is not visible */ continue; + if (IRC_CheckListTooBig(Client, count, MAX_RPL_WHO, "WHO")) + break; + strcpy(flags, who_flags_status(Client_Modes(c))); if (strchr(Client_Modes(c), 'o')) strlcat(flags, "*", sizeof(flags)); if (!write_whoreply(Client, c, "*", flags)) return DISCONNECTED; - + count++; } return IRC_WriteStrClient(Client, RPL_ENDOFWHO_MSG, Client_ID(Client), @@ -1182,7 +1192,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) * - no wildcards for remote clients * - only one wildcard target per local client * - * also, at most ten matches are returned. + * Also, at most MAX_RPL_WHOIS matches are returned. */ if (!has_wildcards || is_remote) { c = Client_Search(query); @@ -1208,13 +1218,18 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) got_wildcard = true; IRC_SetPenalty(Client, 3); - for (c = Client_First(); c && match_count < 10; c = Client_Next(c)) { + for (c = Client_First(); c; c = Client_Next(c)) { + if (IRC_CheckListTooBig(Client, match_count, + MAX_RPL_WHOIS, "WHOIS")) + break; + if (Client_Type(c) != CLIENT_USER) continue; if (!MatchCaseInsensitive(query, Client_ID(c))) continue; if (!IRC_WHOIS_SendReply(Client, from, c)) return DISCONNECTED; + match_count++; } @@ -1310,7 +1325,7 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req ) if (Req->argc > 1) { max = atoi(Req->argv[1]); if (max < 1) - max = MAX_WHOWAS; + max = MAX_RPL_WHOWAS; } /* [View Less]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates Januar 2012