- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : PRIVMSG/NOTICE: don' t stop list processing on invalid target
by alex＠arthur.barton.de 16 Jan '12

16 Jan '12

Module: ngircd.git Branch: master Commit: c1656256df687c4a093ceb502de84bf4b0447f3c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c1656256… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 16 12:37:37 2012 +0100 PRIVMSG/NOTICE: don't stop list processing on invalid target Process further targets, even if one has been a server ID: just skip this one with an error message and continue. --- src/ngircd/irc.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 2b94e33..5af7939 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -469,11 +469,11 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) #else if (Client_Type(cl) != ForceType) { #endif - if (!SendErrors) - return CONNECTED; - return IRC_WriteStrClient(from, ERR_NOSUCHNICK_MSG, - Client_ID(from), - currentTarget); + if (SendErrors && !IRC_WriteStrClient( + from, ERR_NOSUCHNICK_MSG,Client_ID(from), + currentTarget)) + return DISCONNECTED; + goto send_next_target; } #ifndef STRICT_RFC

1 0

Alexander Barton : New RPL_WHOISREGNICK_MSG(307) numeric: indicate if nick is registered
by alex＠arthur.barton.de 16 Jan '12

16 Jan '12

Module: ngircd.git Branch: master Commit: 4d0069c3a8021c32b5bdeeec57f1d41d369587ce URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4d0069c3… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 16 02:18:24 2012 +0100 New RPL_WHOISREGNICK_MSG(307) numeric: indicate if nick is registered --- src/ngircd/irc-info.c | 6 ++++++ src/ngircd/messages.h | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index f383dac..a248e8a 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1108,6 +1108,12 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) Client_ID(c))) return DISCONNECTED; + /* Registered nick name? */ + if (Client_HasMode(c, 'R') && + !IRC_WriteStrClient(from, RPL_WHOISREGNICK_MSG, + Client_ID(from), Client_ID(c))) + return DISCONNECTED; + /* Idle and signon time (local clients only!) */ if (!Conf_MorePrivacy && Client_Conn(c) > NONE && !IRC_WriteStrClient(from, RPL_WHOISIDLE_MSG, diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index c5d8336..0070e70 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -56,6 +56,7 @@ #define RPL_ISON_MSG "303 %s :" #define RPL_UNAWAY_MSG "305 %s :You are no longer marked as being away" #define RPL_NOWAWAY_MSG "306 %s :You have been marked as being away" +#define RPL_WHOISREGNICK_MSG "307 %s %s :is a registered nick" #define RPL_WHOISUSER_MSG "311 %s %s %s %s * :%s" #define RPL_WHOISSERVER_MSG "312 %s %s %s :%s" #define RPL_WHOISOPERATOR_MSG "313 %s %s :is an IRC operator"

1 0

Alexander Barton : IRC_WHOIS_SendReply(): Code cleanup
by alex＠arthur.barton.de 16 Jan '12

16 Jan '12

Module: ngircd.git Branch: master Commit: 12c60a670efe2a3270e7385c7358e87770562c95 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=12c60a67… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 16 02:15:41 2012 +0100 IRC_WHOIS_SendReply(): Code cleanup --- src/ngircd/irc-info.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 24f25af..f383dac 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1025,10 +1025,10 @@ IRC_WHO(CLIENT *Client, REQUEST *Req) /** * Generate WHOIS reply of one actual client. * - * @param Client The client from which this command has been received. - * @param from The client requesting the information ("originator"). - * @param c The client of which information should be returned. - * @returns CONNECTED or DISCONNECTED. + * @param Client The client from which this command has been received. + * @param from The client requesting the information ("originator"). + * @param c The client of which information should be returned. + * @return CONNECTED or DISCONNECTED. */ static bool IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) @@ -1037,6 +1037,10 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) CL2CHAN *cl2chan; CHANNEL *chan; + assert(Client != NULL); + assert(from != NULL); + assert(c != NULL); + /* Nick, user, hostname and client info */ if (!IRC_WriteStrClient(from, RPL_WHOISUSER_MSG, Client_ID(from), Client_ID(c), Client_User(c), @@ -1094,30 +1098,29 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) /* IRC-Operator? */ if (Client_HasMode(c, 'o') && - !IRC_WriteStrClient(from, RPL_WHOISOPERATOR_MSG, - Client_ID(from), Client_ID(c))) - return DISCONNECTED; + !IRC_WriteStrClient(from, RPL_WHOISOPERATOR_MSG, + Client_ID(from), Client_ID(c))) + return DISCONNECTED; /* Connected using SSL? */ if (Conn_UsesSSL(Client_Conn(c)) && - !IRC_WriteStrClient(from, RPL_WHOISSSL_MSG, - Client_ID(from), Client_ID(c))) - return DISCONNECTED; + !IRC_WriteStrClient(from, RPL_WHOISSSL_MSG, Client_ID(from), + Client_ID(c))) + return DISCONNECTED; /* Idle and signon time (local clients only!) */ if (!Conf_MorePrivacy && Client_Conn(c) > NONE && - !IRC_WriteStrClient(from, RPL_WHOISIDLE_MSG, - Client_ID(from), Client_ID(c), - (unsigned long)Conn_GetIdle(Client_Conn(c)), - (unsigned long)Conn_GetSignon(Client_Conn(c)))) - return DISCONNECTED; + !IRC_WriteStrClient(from, RPL_WHOISIDLE_MSG, + Client_ID(from), Client_ID(c), + (unsigned long)Conn_GetIdle(Client_Conn(c)), + (unsigned long)Conn_GetSignon(Client_Conn(c)))) + return DISCONNECTED; /* Away? */ if (Client_HasMode(c, 'a') && - !IRC_WriteStrClient(from, RPL_AWAY_MSG, - Client_ID(from), Client_ID(c), - Client_Away(c))) - return DISCONNECTED; + !IRC_WriteStrClient(from, RPL_AWAY_MSG, + Client_ID(from), Client_ID(c), Client_Away(c))) + return DISCONNECTED; return CONNECTED; } /* IRC_WHOIS_SendReply */

1 0

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/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 */

1 0

Alexander Barton : Remove unused prototype of Lists_AlreadyRegistered()
by alex＠arthur.barton.de 16 Jan '12

16 Jan '12

Module: ngircd.git Branch: master Commit: 7ed08f01efb4e1b0c1aed2de8d9f145604cdfac0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7ed08f01… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 15 19:46:00 2012 +0100 Remove unused prototype of Lists_AlreadyRegistered() This prototype has been introduced by commit fa7bb279 in 2006, but as far as I can see, this function never existed ... --- src/ngircd/lists.h | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/src/ngircd/lists.h b/src/ngircd/lists.h index f709f3f..d0b4d81 100644 --- a/src/ngircd/lists.h +++ b/src/ngircd/lists.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) and Contributors. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -37,9 +37,6 @@ GLOBAL bool Lists_Add PARAMS((struct list_head *h, const char *Mask, time_t ValidUntil, const char *Reason)); GLOBAL void Lists_Del PARAMS((struct list_head *head, const char *Mask)); -GLOBAL bool Lists_AlreadyRegistered PARAMS((const struct list_head *head, - const char *Mask)); - GLOBAL void Lists_Free PARAMS((struct list_head *head)); GLOBAL const char *Lists_MakeMask PARAMS((const char *Pattern));

1 0

Alexander Barton : Limit channel invite and ban lists to 50 entries
by alex＠arthur.barton.de 16 Jan '12

16 Jan '12

Module: ngircd.git Branch: master Commit: 2f7d0c08395b3239e446841e713e0e84385200ea URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2f7d0c08… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 16 00:26:12 2012 +0100 Limit channel invite and ban lists to 50 entries - New function Lists_Count(). - New limit #define MAX_HNDL_CHANNEL_LISTS = 50. - New numeric #define ERR_LISTFULL_MSG(478). - Adjust numeric RPL_ISUPPORT2_MSG(005) accordingly ("MAXLIST") --- src/ngircd/defines.h | 3 +++ src/ngircd/irc-info.c | 3 ++- src/ngircd/irc-mode.c | 6 ++++++ src/ngircd/lists.c | 22 ++++++++++++++++++++++ src/ngircd/lists.h | 1 + src/ngircd/messages.h | 3 ++- 6 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index e758668..e7a14ef 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -181,6 +181,9 @@ /** Max. number of LIST replies. */ #define MAX_RPL_LIST 100 +/** Max. number of elemets allowed in channel invite and ban lists. */ +#define MAX_HNDL_CHANNEL_LISTS 50 + /** Max. number of channel modes with arguments per MODE command. */ #define MAX_HNDL_MODES_ARG 5 diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index fd4cbee..24f25af 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1583,7 +1583,8 @@ IRC_Send_ISUPPORT(CLIENT * Client) return IRC_WriteStrClient(Client, RPL_ISUPPORT2_MSG, Client_ID(Client), CHANNEL_NAME_LEN - 1, Conf_MaxNickLength - 1, COMMAND_LEN - 23, CLIENT_AWAY_LEN - 1, - COMMAND_LEN - 113, MAX_HNDL_MODES_ARG); + COMMAND_LEN - 113, MAX_HNDL_MODES_ARG, + MAX_HNDL_CHANNEL_LISTS); } /* IRC_Send_ISUPPORT */ diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index bb78bcb..c85faa0 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -863,6 +863,12 @@ Add_Ban_Invite(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, if (Lists_CheckDupeMask(list, mask)) return CONNECTED; + if (Client_Type(Client) == CLIENT_USER && + Lists_Count(list) >= MAX_HNDL_CHANNEL_LISTS) + return IRC_WriteStrClient(Client, ERR_LISTFULL_MSG, + Client_ID(Client), + Channel_Name(Channel), mask, + MAX_HNDL_CHANNEL_LISTS); if (what == 'I') { if (!Channel_AddInvite(Channel, mask, false)) diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index fd86f30..c082f1c 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -385,4 +385,26 @@ Lists_Expire(struct list_head *h, const char *ListName) } } +/** + * Return the number of entries of a list. + * + * @param h List head. + * @return Number of items. + */ +GLOBAL unsigned long +Lists_Count(struct list_head *h) +{ + struct list_elem *e; + unsigned long count = 0; + + assert(h != NULL); + + e = h->first; + while (e) { + count++; + e = e->next; + } + return count; +} + /* -eof- */ diff --git a/src/ngircd/lists.h b/src/ngircd/lists.h index d0b4d81..cb2e2c1 100644 --- a/src/ngircd/lists.h +++ b/src/ngircd/lists.h @@ -36,6 +36,7 @@ GLOBAL struct list_elem *Lists_CheckDupeMask PARAMS((const struct list_head *hea GLOBAL bool Lists_Add PARAMS((struct list_head *h, const char *Mask, time_t ValidUntil, const char *Reason)); GLOBAL void Lists_Del PARAMS((struct list_head *head, const char *Mask)); +GLOBAL unsigned long Lists_Count PARAMS((struct list_head *h)); GLOBAL void Lists_Free PARAMS((struct list_head *head)); diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 761e36d..c5d8336 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -22,7 +22,7 @@ #define RPL_CREATED_MSG "003 %s :This server has been started %s" #define RPL_MYINFO_MSG "004 %s %s ngircd-%s %s %s" #define RPL_ISUPPORT1_MSG "005 %s RFC2812 IRCD=ngIRCd CASEMAPPING=ascii PREFIX=(ov)@+ CHANTYPES=#&+ CHANMODES=bI,k,l,imnOPRstz CHANLIMIT=#&+:%d :are supported on this server" -#define RPL_ISUPPORT2_MSG "005 %s CHANNELLEN=%d NICKLEN=%d TOPICLEN=%d AWAYLEN=%d KICKLEN=%d MODES=%d PENALTY :are supported on this server" +#define RPL_ISUPPORT2_MSG "005 %s CHANNELLEN=%d NICKLEN=%d TOPICLEN=%d AWAYLEN=%d KICKLEN=%d MODES=%d MAXLIST=bI:%d PENALTY :are supported on this server" #define RPL_TRACELINK_MSG "200 %s Link %s-%s %s %s V%s %ld %d %d" #define RPL_TRACEOPERATOR_MSG "204 %s Oper 2 :%s" @@ -127,6 +127,7 @@ #define ERR_BANNEDFROMCHAN_MSG "474 %s %s :Cannot join channel (+b)" #define ERR_BADCHANNELKEY_MSG "475 %s %s :Cannot join channel (+k)" #define ERR_NOCHANMODES_MSG "477 %s %s :Channel doesn't support modes" +#define ERR_LISTFULL_MSG "478 %s %s %s: Channel list is full (%d)" #define ERR_NOPRIVILEGES_MSG "481 %s :Permission denied" #define ERR_CHANOPRIVSNEEDED_MSG "482 %s %s :You are not channel operator" #define ERR_CANTKILLSERVER_MSG "483 %s :You can't kill a server!"

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 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 ); + } + }

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 index 383c4de..82e6a5a 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -103,6 +103,27 @@ IRC_MODE( CLIENT *Client, REQUEST *Req ) /** + * Check if the "mode limit" for a client has been reached. + * + * This limit doesn't apply for servers or services! + * + * @param Client The client to check. + * @param Count The number of modes already handled. + * @return true if the limit has been reached. + */ +static bool +Mode_Limit_Reached(CLIENT *Client, int Count) +{ + if (Client_Type(Client) == CLIENT_SERVER + || Client_Type(Client) == CLIENT_SERVICE) + return false; + if (Count < MAX_HNDL_MODES_ARG) + return false; + return true; +} + + +/** * Handle client mode requests * * @param Client The client from which this command has been received. @@ -491,7 +512,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) Client_ID(Origin), Channel_Name(Channel)); break; case 'k': /* Channel key */ - if (mode_arg_count++ >= MAX_HNDL_MODES_ARG) + if (Mode_Limit_Reached(Client, mode_arg_count++)) goto chan_exit; if (!set) { if (modeok) @@ -527,7 +548,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) } break; case 'l': /* Member limit */ - if (mode_arg_count++ >= MAX_HNDL_MODES_ARG) + if (Mode_Limit_Reached(Client, mode_arg_count++)) goto chan_exit; if (!set) { if (modeok) @@ -639,7 +660,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) /* --- Channel lists --- */ case 'I': /* Invite lists */ case 'b': /* Ban lists */ - if (mode_arg_count++ >= MAX_HNDL_MODES_ARG) + if (Mode_Limit_Reached(Client, mode_arg_count++)) goto chan_exit; if (arg_arg > mode_arg) { /* modify list */

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 +++ b/AUTHORS @@ -10,9 +10,10 @@ Note: If you have critics, patches or something else, please feel free to -post a mail to the ngIRCd mailing list: <ngircd-ml(a)arthur.ath.cx> (please see -<http://ngircd.barton.de/#ml> for details). Don't mail the contributors -directly, if possible! +post a mail to the ngIRCd mailing list: <ngircd-ml(a)arthur.barton.de> (please +see <http://ngircd.barton.de/#ml> for details). + +Don't mail the people listed here directly, if possible! Main Authors diff --git a/README b/README index 1ea96ef..2e19d83 100644 --- a/README +++ b/README @@ -71,7 +71,7 @@ releases there. If you are interested in the latest development versions (which are not always stable), then please read the section about "GIT" on the homepage and the file "doc/GIT.txt" which describes the use of GIT, the version control -system used by ngIRCd (homepage: http://git.or.cz/) +system used by ngIRCd (homepage: http://git-scm.com/) VI. Bugs @@ -85,5 +85,6 @@ them at the following URL: There you can read about known bugs and limitations, too. If you have critics, patches or something else, please feel free to post a -mail to the ngIRCd mailing list: <ngircd-ml(a)arthur.ath.cx> (please see -<http://ngircd.barton.de/support.php#ml> for details). +mail to the ngIRCd mailing list: <ngircd-ml(a)arthur.barton.de> (please see +<http://ngircd.barton.de/support.php#ml> for details) or join the ngIRCd +IRC channel: <irc://irc.barton.de/ngircd>.

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 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

1 0