ngIRCd GIT Updates Januar 2012

ngircd-commits@lists.barton.de

2 Teilnehmer
75 Diskussionen

Alexander Barton : Implement channel exception list (mode 'e')
by alex＠arthur.barton.de 21 Jan '12

21 Jan '12

Module: ngircd.git Branch: master Commit: f2fa1045e24f81e5c844dd50d6e299cb1ad9acb2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f2fa1045… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 21 19:59:57 2012 +0100 Implement channel exception list (mode 'e') This allows a channel operator to define exception masks that allow users to join the channel even when a "ban" would match and prevent them from joining: the exception list (e) overrides the ban list (b). --- src/ngircd/channel.c | 47 +++++++++++++++++++++++++++++++++++++++++++-- src/ngircd/channel.h | 11 +++++++-- src/ngircd/defines.h | 2 +- src/ngircd/irc-channel.c | 5 ++- src/ngircd/irc-mode.c | 32 ++++++++++++++++++++++++------ src/ngircd/messages.h | 6 +++- 6 files changed, 85 insertions(+), 18 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=f2fa…

1 0

Alexander Barton : {Add|Del}_Ban_Invite > {Add_To|Del_From}_List(): more generic
by alex＠arthur.barton.de 21 Jan '12

21 Jan '12

Module: ngircd.git Branch: master Commit: 33a165721b79bf896a1895e79fa0809fd6f71174 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=33a16572… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 21 19:27:03 2012 +0100 {Add|Del}_Ban_Invite > {Add_To|Del_From}_List(): more generic --- src/ngircd/irc-mode.c | 63 ++++++++++++++++++++++++++++-------------------- 1 files changed, 37 insertions(+), 26 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 3dd61e7..71c9f79 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -41,10 +41,10 @@ static bool Client_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin, static bool Channel_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)); -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 Add_To_List PARAMS((char what, CLIENT *Prefix, CLIENT *Client, + CHANNEL *Channel, const char *Pattern)); +static bool Del_From_List PARAMS((char what, CLIENT *Prefix, CLIENT *Client, + CHANNEL *Channel, const char *Pattern)); static bool Send_ListChange PARAMS((const bool IsAdd, const char ModeChar, CLIENT *Prefix, CLIENT *Client, @@ -668,10 +668,10 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) /* modify list */ if (modeok) { connected = set - ? Add_Ban_Invite(*mode_ptr, Origin, + ? Add_To_List(*mode_ptr, Origin, Client, Channel, Req->argv[arg_arg]) - : Del_Ban_Invite(*mode_ptr, Origin, + : Del_From_List(*mode_ptr, Origin, Client, Channel, Req->argv[arg_arg]); } else { @@ -834,7 +834,7 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req ) /** - * Add entries to channel ban and invite lists. + * Add entries to channel invite, ban and exception lists. * * @param what Can be 'I' for invite or 'b' for ban list. * @param Prefix The originator of the command. @@ -844,8 +844,8 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req ) * @return CONNECTED or DISCONNECTED. */ static bool -Add_Ban_Invite(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, - const char *Pattern) +Add_To_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, + const char *Pattern) { const char *mask; struct list_head *list; @@ -857,10 +857,14 @@ Add_Ban_Invite(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, mask = Lists_MakeMask(Pattern); - if (what == 'I') - list = Channel_GetListInvites(Channel); - else - list = Channel_GetListBans(Channel); + switch(what) { + case 'I': + list = Channel_GetListInvites(Channel); + break; + case 'b': + list = Channel_GetListBans(Channel); + break; + } if (Lists_CheckDupeMask(list, mask)) return CONNECTED; @@ -871,19 +875,22 @@ Add_Ban_Invite(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, Channel_Name(Channel), mask, MAX_HNDL_CHANNEL_LISTS); - if (what == 'I') { - if (!Channel_AddInvite(Channel, mask, false)) - return CONNECTED; - } else { - if (!Channel_AddBan(Channel, mask)) - return CONNECTED; + switch (what) { + case 'I': + if (!Channel_AddInvite(Channel, mask, false)) + return CONNECTED; + break; + case 'b': + if (!Channel_AddBan(Channel, mask)) + return CONNECTED; + break; } return Send_ListChange(true, what, Prefix, Client, Channel, mask); } /** - * Delete entries from channel ban and invite lists. + * Delete entries from channel invite, ban and exeption lists. * * @param what Can be 'I' for invite or 'b' for ban list. * @param Prefix The originator of the command. @@ -893,8 +900,8 @@ Add_Ban_Invite(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, * @return CONNECTED or DISCONNECTED. */ static bool -Del_Ban_Invite(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, - const char *Pattern) +Del_From_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, + const char *Pattern) { const char *mask; struct list_head *list; @@ -906,10 +913,14 @@ Del_Ban_Invite(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, mask = Lists_MakeMask(Pattern); - if (what == 'I') - list = Channel_GetListInvites(Channel); - else - list = Channel_GetListBans(Channel); + switch (what) { + case 'I': + list = Channel_GetListInvites(Channel); + break; + case 'b': + list = Channel_GetListBans(Channel); + break; + } if (!Lists_CheckDupeMask(list, mask)) return CONNECTED;

1 0

Alexander Barton : Rename ShowInvitesBans() to ShowChannelList(), make it more flexible
by alex＠arthur.barton.de 21 Jan '12

21 Jan '12

Module: ngircd.git Branch: master Commit: a3a4b5f6966c4378dc023ed37942e0e8f315aa56 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a3a4b5f6… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 21 13:48:31 2012 +0100 Rename ShowInvitesBans() to ShowChannelList(), make it more flexible --- src/ngircd/channel.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 4d323f2..781d91a 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -1028,24 +1028,25 @@ Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce) static bool -ShowInvitesBans(struct list_head *head, CLIENT *Client, CHANNEL *Channel, bool invite) +ShowChannelList(struct list_head *head, CLIENT *Client, CHANNEL *Channel, + char *msg, char *msg_end) { struct list_elem *e; - char *msg = invite ? RPL_INVITELIST_MSG : RPL_BANLIST_MSG; - char *msg_end; - assert( Client != NULL ); - assert( Channel != NULL ); + assert (Client != NULL); + assert (Channel != NULL); e = Lists_GetFirst(head); while (e) { - if( ! IRC_WriteStrClient( Client, msg, Client_ID( Client ), - Channel_Name( Channel ), Lists_GetMask(e) )) return DISCONNECTED; + if (!IRC_WriteStrClient(Client, msg, Client_ID(Client), + Channel_Name(Channel), + Lists_GetMask(e))) + return DISCONNECTED; e = Lists_GetNext(e); } - msg_end = invite ? RPL_ENDOFINVITELIST_MSG : RPL_ENDOFBANLIST_MSG; - return IRC_WriteStrClient( Client, msg_end, Client_ID( Client ), Channel_Name( Channel )); + return IRC_WriteStrClient(Client, msg_end, Client_ID(Client), + Channel_Name(Channel)); } @@ -1057,7 +1058,8 @@ Channel_ShowBans( CLIENT *Client, CHANNEL *Channel ) assert( Channel != NULL ); h = Channel_GetListBans(Channel); - return ShowInvitesBans(h, Client, Channel, false); + return ShowChannelList(h, Client, Channel, RPL_BANLIST_MSG, + RPL_ENDOFBANLIST_MSG); } @@ -1069,7 +1071,8 @@ Channel_ShowInvites( CLIENT *Client, CHANNEL *Channel ) assert( Channel != NULL ); h = Channel_GetListInvites(Channel); - return ShowInvitesBans(h, Client, Channel, true); + return ShowChannelList(h, Client, Channel, RPL_INVITELIST_MSG, + RPL_ENDOFINVITELIST_MSG); }

1 0

Alexander Barton : PRIVMSG/NOTICE: handle nick!user@ host masks case-insensitive
by alex＠arthur.barton.de 21 Jan '12

21 Jan '12

Module: ngircd.git Branch: master Commit: 39412d648652b3fcb387cf04bf7fa9004cfcd8ba URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=39412d64… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 21 13:21:36 2012 +0100 PRIVMSG/NOTICE: handle nick!user@host masks case-insensitive And enhance our test suite to check this a little bit better :-) --- src/ngircd/irc.c | 4 ++-- src/testsuite/message-test.e | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 5af7939..9508ecc 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -440,8 +440,8 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) Client_Type(cl) != CLIENT_SERVICE) continue; if (nick != NULL && host != NULL) { - if (strcmp(nick, Client_ID(cl)) == 0 && - strcmp(user, Client_User(cl)) == 0 && + if (strcasecmp(nick, Client_ID(cl)) == 0 && + strcasecmp(user, Client_User(cl)) == 0 && strcasecmp(host, Client_HostnameCloaked(cl)) == 0) break; else diff --git a/src/testsuite/message-test.e b/src/testsuite/message-test.e index eb26ac4..d0ffcef 100644 --- a/src/testsuite/message-test.e +++ b/src/testsuite/message-test.e @@ -35,7 +35,7 @@ expect { "@* PRIVMSG nick :test\r*@* PRIVMSG nick :test" } -send "privmsg nick,#testChannel,nick :test\r" +send "privmsg Nick,#testChannel,nick :test\r" expect { timeout { exit 1 } "@* PRIVMSG nick :test\r*401*@* PRIVMSG nick :test" @@ -47,7 +47,7 @@ expect { "401" } -send "privmsg ~user(a)ngircd.test.server :test\r" +send "privmsg ~UsEr(a)ngIRCd.Test.Server :test\r" expect { timeout { exit 1 } "@* PRIVMSG nick :test" @@ -65,7 +65,7 @@ expect { # "@* PRIVMSG nick :test" #} # -#send "privmsg nick!~user@localhost :test\r" +#send "privmsg Nick!~User@LocalHost :test\r" #expect { # timeout { exit 1 } # "@* PRIVMSG nick :test"

1 0

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 : Implement user mode 'C': require "same channel" to send message
by alex＠arthur.barton.de 16 Jan '12

16 Jan '12

Module: ngircd.git Branch: master Commit: 1f4711a5474d2f0ea4664bd9b54f036af11f96cd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1f4711a5… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 16 11:43:22 2012 +0100 Implement user mode 'C': require "same channel" to send message If the target user of a PRIVMSG or NOTICE command has the user mode 'C' set, it is required that both sender and receiver are on the same channel. This prevents private flooding by completely unknown clients. --- doc/Modes.txt | 1 + src/ngircd/defines.h | 2 +- src/ngircd/irc-mode.c | 1 + src/ngircd/irc.c | 19 +++++++++++++++++++ src/ngircd/messages.h | 1 + 5 files changed, 23 insertions(+), 1 deletions(-) diff --git a/doc/Modes.txt b/doc/Modes.txt index 20e927b..0b0e488 100644 --- a/doc/Modes.txt +++ b/doc/Modes.txt @@ -23,6 +23,7 @@ channels he is using at the moment. a 0.3.0 User is away. c 17 IRC operator wants to receive connect/disconnect NOTICEs. + C 19 Only users that share a channel are allowed to send messages. i 0.0.1 User is "invisible". o 0.0.1 User is IRC operator. r 0.0.1 User is restricted. diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index e7a14ef..9dc5e92 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -158,7 +158,7 @@ #endif /** Supported user modes. */ -#define USERMODES "aciorRswx" +#define USERMODES "acCiorRswx" /** Supported channel modes. */ #define CHANMODES "biIklmnoOPRstvz" diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index c85faa0..3dd61e7 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -214,6 +214,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) /* Validate modes */ x[0] = '\0'; switch (*mode_ptr) { + case 'C': /* Only messages from clients sharing a channel */ case 'i': /* Invisible */ case 's': /* Server messages */ case 'w': /* Wallops messages */ diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 10e3e45..2b94e33 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -349,6 +349,7 @@ static bool Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) { CLIENT *cl, *from; + CL2CHAN *cl2chan; CHANNEL *chan; char *currentTarget = Req->argv[0]; char *lastCurrentTarget = NULL; @@ -485,6 +486,23 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) } #endif + if (Client_HasMode(cl, 'C')) { + cl2chan = Channel_FirstChannelOf(cl); + while (cl2chan) { + chan = Channel_GetChannel(cl2chan); + if (Channel_IsMemberOf(chan, from)) + break; + cl2chan = Channel_NextChannelOf(cl, cl2chan); + } + if (!cl2chan) { + if (SendErrors && !IRC_WriteStrClient( + from, ERR_NOTONSAMECHANNEL_MSG, + Client_ID(from), Client_ID(cl))) + return DISCONNECTED; + goto send_next_target; + } + } + if (SendErrors && (Client_Type(Client) != CLIENT_SERVER) && strchr(Client_Modes(cl), 'a')) { /* Target is away */ @@ -522,6 +540,7 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) return DISCONNECTED; } + send_next_target: currentTarget = strtok_r(NULL, ",", &lastCurrentTarget); if (currentTarget) Conn_SetPenalty(Client_Conn(Client), 1); diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 0070e70..6a784fe 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -134,6 +134,7 @@ #define ERR_CANTKILLSERVER_MSG "483 %s :You can't kill a server!" #define ERR_RESTRICTED_MSG "484 %s :Your connection is restricted" #define ERR_NOOPERHOST_MSG "491 %s :Not configured for your host" +#define ERR_NOTONSAMECHANNEL_MSG "493 %s :You must share a common channel with %s" #define ERR_UMODEUNKNOWNFLAG_MSG "501 %s :Unknown mode" #define ERR_UMODEUNKNOWNFLAG2_MSG "501 %s :Unknown mode \"%c%c\""

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

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