- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : irc-write.c: Clean up code and add more documentation comments
by alex＠arthur.barton.de 06 Aug '13

06 Aug '13

Module: ngircd.git Branch: master Commit: 0a3d8d60d3c3ac66d09346aa02c10c9649b62e99 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0a3d8d60… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 6 23:21:48 2013 +0200 irc-write.c: Clean up code and add more documentation comments --- src/ngircd/irc-write.c | 189 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 131 insertions(+), 58 deletions(-) diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c index f4d4361..9375356 100644 --- a/src/ngircd/irc-write.c +++ b/src/ngircd/irc-write.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2013 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 @@ -33,17 +33,21 @@ #include "exp.h" #include "irc-write.h" - #define SEND_TO_USER 1 #define SEND_TO_SERVER 2 - static const char *Get_Prefix PARAMS((CLIENT *Target, CLIENT *Client)); static void cb_writeStrServersPrefixFlag PARAMS((CLIENT *Client, CLIENT *Prefix, void *Buffer)); static void Send_Marked_Connections PARAMS((CLIENT *Prefix, const char *Buffer)); - +/** + * Send a message to a client. + * + * @param Client The target client. + * @param Format Format string. + * @return CONNECTED or DISCONNECTED. + */ #ifdef PROTOTYPES GLOBAL bool IRC_WriteStrClient( CLIENT *Client, const char *Format, ... ) @@ -56,27 +60,31 @@ va_dcl #endif { char buffer[1000]; - bool ok = CONNECTED; va_list ap; - assert( Client != NULL ); - assert( Format != NULL ); + assert(Client != NULL); + assert(Format != NULL); #ifdef PROTOTYPES - va_start( ap, Format ); + va_start(ap, Format); #else - va_start( ap ); + va_start(ap); #endif - vsnprintf( buffer, 1000, Format, ap ); - va_end( ap ); - - /* to the client itself */ - ok = IRC_WriteStrClientPrefix( Client, Client_ThisServer( ), "%s", buffer ); - - return ok; -} /* IRC_WriteStrClient */ + vsnprintf(buffer, 1000, Format, ap); + va_end(ap); + return IRC_WriteStrClientPrefix(Client, Client_ThisServer(), + "%s", buffer); +} +/** + * Send a message to a client using a specific prefix. + * + * @param Client The target client. + * @param Prefix The prefix to use. + * @param Format Format string. + * @return CONNECTED or DISCONNECTED. + */ #ifdef PROTOTYPES GLOBAL bool IRC_WriteStrClientPrefix(CLIENT *Client, CLIENT *Prefix, const char *Format, ...) @@ -108,9 +116,18 @@ va_dcl return Conn_WriteStr(Client_Conn(Client_NextHop(Client)), ":%s %s", Get_Prefix(Client_NextHop(Client), Prefix), buffer); -} /* IRC_WriteStrClientPrefix */ - +} +/** + * Send a message to all client in a channel. + * + * The message is only sent once per remote server. + * + * @param Client The sending client, excluded while forwarding the message. + * @param Channel The target channel. + * @param Remote If not set, the message is sent to local clients only. + * @param Format Format string. + */ #ifdef PROTOTYPES GLOBAL void IRC_WriteStrChannel(CLIENT *Client, CHANNEL *Chan, bool Remote, @@ -140,13 +157,19 @@ va_dcl va_end( ap ); IRC_WriteStrChannelPrefix(Client, Chan, Client_ThisServer(), - Remote, "%s", buffer ); -} /* IRC_WriteStrChannel */ - + Remote, "%s", buffer); +} /** - * send message to all clients in the same channel, but only send message - * once per remote server. + * Send a message to all client in a channel using a specific prefix. + * + * The message is only sent once per remote server. + * + * @param Client The sending client, excluded while forwarding the message. + * @param Channel The target channel. + * @param Prefix The prefix to use. + * @param Remote If not set, the message is sent to local clients only. + * @param Format Format string. */ #ifdef PROTOTYPES GLOBAL void @@ -185,29 +208,36 @@ va_dcl Conn_ClearFlags( ); cl2chan = Channel_FirstMember( Chan ); - while( cl2chan ) - { + while(cl2chan) { c = Channel_GetClient( cl2chan ); - if( ! Remote ) - { - if( Client_Conn( c ) <= NONE ) c = NULL; - else if( Client_Type( c ) == CLIENT_SERVER ) c = NULL; + if (!Remote) { + if (Client_Conn(c) <= NONE) + c = NULL; + else if(Client_Type(c) == CLIENT_SERVER) + c = NULL; } - if( c ) c = Client_NextHop( c ); + if(c) + c = Client_NextHop(c); - if( c && ( c != Client )) - { + if(c && c != Client) { /* Ok, another Client */ - conn = Client_Conn( c ); - if( Client_Type( c ) == CLIENT_SERVER ) Conn_SetFlag( conn, SEND_TO_SERVER ); - else Conn_SetFlag( conn, SEND_TO_USER ); + conn = Client_Conn(c); + if (Client_Type(c) == CLIENT_SERVER) + Conn_SetFlag(conn, SEND_TO_SERVER); + else + Conn_SetFlag(conn, SEND_TO_USER); } - cl2chan = Channel_NextMember( Chan, cl2chan ); + cl2chan = Channel_NextMember(Chan, cl2chan); } Send_Marked_Connections(Prefix, buffer); -} /* IRC_WriteStrChannelPrefix */ - +} +/** + * Send a message to all the servers in the network. + * + * @param Client The sending client, excluded while forwarding the message. + * @param Format Format string. + */ #ifdef PROTOTYPES GLOBAL void IRC_WriteStrServers(CLIENT *ExceptOf, const char *Format, ...) @@ -232,10 +262,16 @@ va_dcl vsnprintf( buffer, 1000, Format, ap ); va_end( ap ); - IRC_WriteStrServersPrefix( ExceptOf, Client_ThisServer( ), "%s", buffer ); -} /* IRC_WriteStrServers */ - + IRC_WriteStrServersPrefix(ExceptOf, Client_ThisServer(), "%s", buffer); +} +/** + * Send a message to all the servers in the network using a specific prefix. + * + * @param Client The sending client, excluded while forwarding the message. + * @param Prefix The prefix to use. + * @param Format Format string. + */ #ifdef PROTOTYPES GLOBAL void IRC_WriteStrServersPrefix(CLIENT *ExceptOf, CLIENT *Prefix, @@ -264,9 +300,17 @@ va_dcl va_end( ap ); IRC_WriteStrServersPrefixFlag( ExceptOf, Prefix, '\0', "%s", buffer ); -} /* IRC_WriteStrServersPrefix */ - +} +/** + * Send a message to all the servers in the network using a specific prefix + * and matching a "client flag". + * + * @param Client The sending client, excluded while forwarding the message. + * @param Prefix The prefix to use. + * @param Flag Client flag that must be set on the target. + * @param Format Format string. + */ #ifdef PROTOTYPES GLOBAL void IRC_WriteStrServersPrefixFlag(CLIENT *ExceptOf, CLIENT *Prefix, char Flag, @@ -297,9 +341,18 @@ va_dcl IRC_WriteStrServersPrefixFlag_CB(ExceptOf, Prefix, Flag, cb_writeStrServersPrefixFlag, buffer); -} /* IRC_WriteStrServersPrefixFlag */ - +} +/** + * Send a message to all the servers in the network using a specific prefix + * and matching a "client flag" using a callback function. + * + * @param Client The sending client, excluded while forwarding the message. + * @param Prefix The prefix to use. + * @param Flag Client flag that must be set on the target. + * @param callback Callback function. + * @param Format Format string. + */ GLOBAL void IRC_WriteStrServersPrefixFlag_CB(CLIENT *ExceptOf, CLIENT *Prefix, char Flag, void (*callback)(CLIENT *, CLIENT *, void *), void *cb_data) @@ -316,12 +369,20 @@ IRC_WriteStrServersPrefixFlag_CB(CLIENT *ExceptOf, CLIENT *Prefix, char Flag, } c = Client_Next(c); } -} /* IRC_WriteStrServersPrefixFlag */ - +} /** - * send message to all clients that are in the same channels as the client sending this message. - * only send message once per remote server. + * Send a message to all "related" clients. + * + * Related clients are the one that share one ore more channels with the client + * sending this message. + * + * The message is only sent once per remote server. + * + * @param Client The sending client, excluded while forwarding the message. + * @param Prefix The prefix to use. + * @param Remote If not set, the message is sent to local clients only. + * @param Format Format string. */ #ifdef PROTOTYPES GLOBAL void @@ -387,10 +448,13 @@ va_dcl Send_Marked_Connections(Prefix, buffer); } /* IRC_WriteStrRelatedPrefix */ - /** * Send WALLOPS message. - */ + * + * @param Client The sending client, excluded while forwarding the message. + * @param From The (remote) sender of the message. + * @param Format Format string. +*/ #ifdef PROTOTYPES GLOBAL void IRC_SendWallops(CLIENT *Client, CLIENT *From, const char *Format, ...) @@ -434,7 +498,14 @@ va_dcl } } /* IRC_SendWallops */ - +/** + * Set a "penalty time" for an IRC client. + * + * Note: penalty times are never set for server links! + * + * @param Client The client. + * @param Seconds The additional "penalty time" to enforce. + */ GLOBAL void IRC_SetPenalty( CLIENT *Client, time_t Seconds ) { @@ -450,7 +521,6 @@ IRC_SetPenalty( CLIENT *Client, time_t Seconds ) Conn_SetPenalty(c, Seconds); } /* IRC_SetPenalty */ - static const char * Get_Prefix(CLIENT *Target, CLIENT *Client) { @@ -463,14 +533,18 @@ Get_Prefix(CLIENT *Target, CLIENT *Client) return Client_MaskCloaked(Client); } /* Get_Prefix */ - static void cb_writeStrServersPrefixFlag(CLIENT *Client, CLIENT *Prefix, void *Buffer) { IRC_WriteStrClientPrefix(Client, Prefix, "%s", Buffer); } /* cb_writeStrServersPrefixFlag */ - +/** + * Send a message to all marked connections using a specific prefix. + * + * @param Prefix The prefix to use. + * @param Buffer The message to send. + */ static void Send_Marked_Connections(CLIENT *Prefix, const char *Buffer) { @@ -487,9 +561,8 @@ Send_Marked_Connections(CLIENT *Prefix, const char *Buffer) else if (Conn_Flag(conn) == SEND_TO_USER) Conn_WriteStr(conn, ":%s %s", Client_MaskCloaked(Prefix), Buffer); - conn = Conn_Next( conn ); + conn = Conn_Next(conn); } } - /* -eof- */

1 0

Alexander Barton : Streamline punctuation of log messages
by alex＠arthur.barton.de 06 Aug '13

06 Aug '13

Module: ngircd.git Branch: master Commit: 8f5cbe51a79c786be30ebc93466988cf67a825e1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8f5cbe51… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 6 21:34:32 2013 +0200 Streamline punctuation of log messages See commit d38d153f for details. --- src/ngircd/conn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 01253a2..86aeb65 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -222,7 +222,7 @@ cb_connserver(int sock, UNUSED short what) if (server < 0) { Log(LOG_ERR, "Connection on socket %d to \"%s\" aborted!", sock, My_Connections[idx].host); - Conn_Close(idx, "Connection aborted!", NULL, false); + Conn_Close(idx, "Connection aborted", NULL, false); return; } @@ -1452,7 +1452,7 @@ Handle_Write( CONN_ID Idx ) Log(LOG_ERR, "Write error on connection %d (socket %d): %s!", Idx, My_Connections[Idx].sock, strerror(errno)); - Conn_Close(Idx, "Write error!", NULL, false); + Conn_Close(Idx, "Write error", NULL, false); return false; }

1 0

Alexander Barton : Update NEWS and ChangeLog files
by alex＠arthur.barton.de 06 Aug '13

06 Aug '13

Module: ngircd.git Branch: master Commit: bd0de15d314e6eacd0ea77be49473fedc7b2667f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bd0de15d… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 6 21:14:56 2013 +0200 Update NEWS and ChangeLog files --- ChangeLog | 18 ++++++++++++++++++ NEWS | 13 +++++++++++++ 2 files changed, 31 insertions(+) diff --git a/ChangeLog b/ChangeLog index 976a9f4..af4bc08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,23 @@ ngIRCd 21 + - Implement a new configuration option "AllowedChannelTypes" that lists + all allowed channel types (channel prefixes) for newly created channels + on the local server. By default, all supported channel types are allowed. + If set to the empty string, local clients can't create new channels at + all, which equals the old "PredefChannelsOnly = yes" setting. + This change deprecates the "PredefChannelsOnly" variable, too, but it is + still supported and translated to the apropriate "AllowedChannelTypes" + setting. When the old "PredefChannelsOnly" variable is processed, a + warning message is logged. (Closes bug #152) + - Add support for "client certificate fingerprinting". When a client + passes an SSL certificate to the server, the "fingerprint" will be + forwarded in the network which enables IRC services to identify the + user using this certificate and not using passwords. + - IRC Operator names, as defined in ngircd.conf, are logged now when + handling successful OPER commands. + - Some error conditions while handling IRC commands, like "permission + denied" or "need more parameters", result in more penalty times. - The numeric replies of some commands became split too early which resulted in more numeric reply lines than necessary. - Implement a new configuration option "IncludeDir" in the "[Options]" @@ -67,6 +84,7 @@ ngIRCd 21 Please note that neither the Operator (+o) not the "bot status" (+B) of an IRC service id displayed in the output. - Exit message: use singular & plural :-) + - autogen.sh: Check for autoconf/automake wrapper scripts - Add missing punctuation marks in log messages and adjust some severity levels. - AUTHORS file: Update list of contributors. diff --git a/NEWS b/NEWS index 420c1d8..0b86a43 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,19 @@ ngIRCd 21 + - Implement a new configuration option "AllowedChannelTypes" that lists + all allowed channel types (channel prefixes) for newly created channels + on the local server. By default, all supported channel types are allowed. + If set to the empty string, local clients can't create new channels at + all, which equals the old "PredefChannelsOnly = yes" setting. + This change deprecates the "PredefChannelsOnly" variable, too, but it is + still supported and translated to the apropriate "AllowedChannelTypes" + setting. When the old "PredefChannelsOnly" variable is processed, a + warning message is logged. (Closes bug #152) + - Add support for "client certificate fingerprinting". When a client + passes an SSL certificate to the server, the "fingerprint" will be + forwarded in the network which enables IRC services to identify the + user using this certificate and not using passwords. - Implement a new configuration option "IncludeDir" in the "[Options]" section that can be used to specify a directory which can contain further configuration files and configuration file snippets matching

1 0

Federico G. Schwindt : More spelling corrections
by alex＠arthur.barton.de 05 Aug '13

05 Aug '13

Module: ngircd.git Branch: master Commit: fcdb5cf8dd1579172ad894ddc8c07defa16f0822 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fcdb5cf8… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Mon Aug 5 11:06:52 2013 +0100 More spelling corrections --- doc/Commands.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/Commands.txt b/doc/Commands.txt index c43b50e..e049f5e 100644 --- a/doc/Commands.txt +++ b/doc/Commands.txt @@ -145,7 +145,7 @@ Connection Handling Commands Please note: The RFCs state that the <token> parameter is used to specify the - origin of the PING command when forwared in the network, but this + origin of the PING command when forwarded in the network, but this is not the case: the sender is specified using the prefix as usual, and the parameter is used to identify the PONG reply in practice. @@ -256,7 +256,7 @@ General Commands modes are returned. Otherwise the modes are adjusted accordingly and the changes will be reported back to the client. . - All user and chnnel "modes" are indicated by single case-sensitive + All user and channel "modes" are indicated by single case-sensitive characters. . Please note that a user can only get and set his own modes, and not @@ -615,7 +615,7 @@ Channel Commands - LIST LIST [<channel>[,<channel>[,...]] [<server>]] . - List all visible <channels> (comma-seperated list). + List all visible <channels> (comma-separated list). . If <server> is given, the command will be forwarded to <server> for evaluation. @@ -635,7 +635,7 @@ Channel Commands - TOPIC TOPIC <channel> [<topic>] . - Cchange or view the topic of a channel. + Change or view the topic of a channel. . The topic for channel <channel> is returned if there is no <topic> given. If the <topic> parameter is present, the topic for that @@ -694,7 +694,7 @@ Administrative Commands This command provides timed G-Lines (network-wide bans). . If a client matches a G-Line, it cannot connect to any server on - the IRC network for <timeout> seconds. When <timoeut> is 0, it make + the IRC network for <timeout> seconds. When <timeout> is 0, it make the G-Line permanent. . If no <timeout> and no <reason> is given, the G-Line is removed. @@ -727,7 +727,7 @@ Administrative Commands This command provides timed K-Lines (server-local bans). . If a client matches a K-Line, it cannot connect to this server for - <timeout> seconds. When <timoeut> is 0, it makes the K-Line permanent. + <timeout> seconds. When <timeout> is 0, it makes the K-Line permanent. . If no <timeout> and no <reason> is given, the K-Line is removed. . @@ -904,7 +904,7 @@ Server Protocol Commands - NJOIN NJOIN <channel> [<mode>]<nick>[,[<mode>]<nick>[,...]] . - The NJOIN command is used on setver-links to add users with <nick> + The NJOIN command is used on server-links to add users with <nick> and <mode> to a <channel> while peering. . The NJOIN command is allowed on server-links only.

1 0

Federico G. Schwindt : Inline who_flags_status
by alex＠arthur.barton.de 05 Aug '13

05 Aug '13

Module: ngircd.git Branch: master Commit: 7db84815000adcf561f2be7de1234cd8277bc0be URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7db84815… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Mon Aug 5 11:05:12 2013 +0100 Inline who_flags_status --- src/ngircd/irc-info.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 5d2ae36..f87714f 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -87,14 +87,6 @@ write_whoreply(CLIENT *Client, CLIENT *c, const char *channelname, const char *f flags, Client_Hops(c), Client_Info(c)); } -static const char * -who_flags_status(const char *client_modes) -{ - if (strchr(client_modes, 'a')) - return "G"; /* away */ - return "H"; -} - /** * Return channel user mode prefix(es). * @@ -152,7 +144,6 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps) { bool is_visible, is_member, is_ircop; CL2CHAN *cl2chan; - const char *client_modes; char flags[10]; CLIENT *c; int count = 0; @@ -173,17 +164,21 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps) for (; cl2chan ; cl2chan = Channel_NextMember(Chan, cl2chan)) { c = Channel_GetClient(cl2chan); - client_modes = Client_Modes(c); is_ircop = Client_HasMode(c, 'o'); if (OnlyOps && !is_ircop) continue; is_visible = Client_HasMode(c, 'i'); if (is_member || is_visible) { - strlcpy(flags, who_flags_status(client_modes), - sizeof(flags)); + memset(flags, 0, sizeof(flags)); + + if (Client_HasMode(c, 'a')) + flags[0] = 'G'; /* away */ + else + flags[0] = 'H'; + if (is_ircop) - strlcat(flags, "*", sizeof(flags)); + flags[1] = '*'; who_flags_qualifier(Client, Channel_UserModes(Chan, c), flags, sizeof(flags)); @@ -218,7 +213,7 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps) CL2CHAN *cl2chan; CHANNEL *chan; bool client_match, is_visible; - char flags[4]; + char flags[3]; int count = 0; assert (Client != NULL); @@ -274,9 +269,15 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps) if (IRC_CheckListTooBig(Client, count, MAX_RPL_WHO, "WHO")) break; - strlcpy(flags, who_flags_status(Client_Modes(c)), sizeof(flags)); + memset(flags, 0, sizeof(flags)); + + if (Client_HasMode(c, 'a')) + flags[0] = 'G'; /* away */ + else + flags[0] = 'H'; + if (Client_HasMode(c, 'o')) - strlcat(flags, "*", sizeof(flags)); + flags[1] = '*'; if (!write_whoreply(Client, c, "*", flags)) return DISCONNECTED;

1 0

Federico G. Schwindt : Use Client_HasMode and Client_HasFlag where appropriate
by alex＠arthur.barton.de 04 Aug '13

04 Aug '13

Module: ngircd.git Branch: master Commit: 672a1679639d597cf1c4336687ac78dcc24a9559 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=672a1679… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Sun Aug 4 17:25:24 2013 +0100 Use Client_HasMode and Client_HasFlag where appropriate --- src/ngircd/client.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 09bd6fd..a6ada37 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -217,7 +217,7 @@ Init_New_Client(CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, if (Type == CLIENT_SERVER) Generate_MyToken(client); - if (strchr(client->modes, 'a')) + if (Client_HasMode(client, 'a')) strlcpy(client->away, DEFAULT_AWAY_MSG, sizeof(client->away)); client->next = (POINTER *)My_Clients; @@ -524,7 +524,7 @@ Client_ModeAdd( CLIENT *Client, char Mode ) assert( Client != NULL ); x[0] = Mode; x[1] = '\0'; - if (!strchr( Client->modes, x[0])) { + if (!Client_HasMode(Client, x[0])) { strlcat( Client->modes, x, sizeof( Client->modes )); return true; } @@ -1131,7 +1131,8 @@ Client_OperCount( void ) c = My_Clients; while( c ) { - if( c && ( c->type == CLIENT_USER ) && ( strchr( c->modes, 'o' ))) cnt++; + if (c && c->type == CLIENT_USER && Client_HasMode(c, 'o' )) + cnt++; c = (CLIENT *)c->next; } return cnt; @@ -1580,7 +1581,7 @@ Client_Announce(CLIENT * Client, CLIENT * Prefix, CLIENT * User) } else { /* RFC 2813 mode: one combined NICK or SERVICE command */ if (Client_Type(User) == CLIENT_SERVICE - && strchr(Client_Flags(Client), 'S')) { + && Client_HasFlag(Client, 'S')) { if (!IRC_WriteStrClientPrefix(Client, Prefix, "SERVICE %s %d * +%s %d :%s", Client_Mask(User), @@ -1599,7 +1600,7 @@ Client_Announce(CLIENT * Client, CLIENT * Prefix, CLIENT * User) } } - if (strchr(Client_Flags(Client), 'M')) { + if (Client_HasFlag(Client, 'M')) { /* Synchronize metadata */ if (Client_HostnameCloaked(User)) { if (!IRC_WriteStrClientPrefix(Client, Prefix,

1 0

Federico G. Schwindt : Simplify mode checking on channels and users within a channel
by alex＠arthur.barton.de 04 Aug '13

04 Aug '13

Module: ngircd.git Branch: master Commit: c74115f25c8ea3f67c75120c0a1398975bac03ad URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c74115f2… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Sun Aug 4 18:28:04 2013 +0100 Simplify mode checking on channels and users within a channel Add Channel_HasMode() and Channel_UserHasMode() and use it where possible. --- src/ngircd/channel.c | 100 +++++++++++++++++++++++----------------------- src/ngircd/channel.h | 4 +- src/ngircd/irc-channel.c | 34 ++++++++-------- src/ngircd/irc-info.c | 16 ++++---- src/ngircd/irc-mode.c | 22 +++++----- src/ngircd/irc-op.c | 14 +++---- src/ngircd/irc.c | 6 +-- src/ngircd/numeric.c | 14 +++---- 8 files changed, 104 insertions(+), 106 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=c741…

1 0

Federico G. Schwindt : Convert more code to use Channel_HasMode
by alex＠arthur.barton.de 04 Aug '13

04 Aug '13

Module: ngircd.git Branch: master Commit: 74514b8c233eebc95fe0cc1116074dcf6899d841 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=74514b8c… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Sun Aug 4 21:16:03 2013 +0100 Convert more code to use Channel_HasMode --- src/ngircd/irc-channel.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index d06caa3..6f20b03 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -657,7 +657,7 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) GLOBAL bool IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) { - char modes_add[COMMAND_LEN], l[16], *ptr; + char modes_add[COMMAND_LEN], l[16]; CLIENT *from; CHANNEL *chan; int arg_topic; @@ -688,9 +688,8 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) return CONNECTED; if (Req->argv[1][0] == '+') { - ptr = Channel_Modes(chan); - if (!*ptr) { - /* OK, this channel doesn't have modes jet, + if (!Channel_Modes(chan)) { + /* OK, this channel doesn't have modes yet, * set the received ones: */ Channel_SetModes(chan, &Req->argv[1][1]); @@ -706,21 +705,15 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) } strcpy(modes_add, ""); - ptr = Channel_Modes(chan); - while (*ptr) { - if (*ptr == 'l') { - snprintf(l, sizeof(l), " %lu", - Channel_MaxUsers(chan)); - strlcat(modes_add, l, - sizeof(modes_add)); - } - if (*ptr == 'k') { - strlcat(modes_add, " ", - sizeof(modes_add)); - strlcat(modes_add, Channel_Key(chan), - sizeof(modes_add)); - } - ptr++; + if (Channel_HasMode(chan, 'l')) { + snprintf(l, sizeof(l), " %lu", + Channel_MaxUsers(chan)); + strlcat(modes_add, l, sizeof(modes_add)); + } + if (Channel_HasMode(chan, 'k')) { + strlcat(modes_add, " ", sizeof(modes_add)); + strlcat(modes_add, Channel_Key(chan), + sizeof(modes_add)); } /* Inform members of this channel */ @@ -734,8 +727,7 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) if (arg_topic > 0) { /* We got a topic */ - ptr = Channel_Topic( chan ); - if (!*ptr && Req->argv[arg_topic][0]) { + if (!Channel_Topic( chan ) && Req->argv[arg_topic][0]) { /* OK, there is no topic jet */ Channel_SetTopic(chan, Client, Req->argv[arg_topic]); IRC_WriteStrChannelPrefix(Client, chan, from, false,

1 0

Alexander Barton : Implement new configuration option "AllowedChannelTypes"
by alex＠arthur.barton.de 04 Aug '13

04 Aug '13

Module: ngircd.git Branch: master Commit: 5258fb7f7c3d92a35083f869bae4f05ab988d2da URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5258fb7f… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 4 03:06:53 2013 +0200 Implement new configuration option "AllowedChannelTypes" The new configuration variable "AllowedChannelTypes" lists all allowed channel types (channel prefixes) for newly created channels on the local server. By default, all supported channel types are allowed. If set to the empty string, local clients can't create new channels at all, which equals the old "PredefChannelsOnly = yes" setting. This patch deprecates the "PredefChannelsOnly" variable, too, but it is still supported and translated to the apropriate "AllowedChannelTypes" setting. When "PredefChannelsOnly" is processed, a warning message is logged. Closes bug #152. --- doc/sample-ngircd.conf.tmpl | 9 ++++++--- man/ngircd.conf.5.tmpl | 12 ++++++------ src/ngircd/conf.c | 44 ++++++++++++++++++++++++++++++++++++++++--- src/ngircd/conf.h | 4 ++-- src/ngircd/irc-channel.c | 2 +- 5 files changed, 56 insertions(+), 15 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index 31333ec..99960e9 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -128,6 +128,12 @@ # behavior of ngIRCd. If you want to get started quickly, you most # probably don't have to make changes here -- they are all optional. + # List of allowed channel types (channel prefixes) for newly created + # channels on the local server. By default, all supported channel + # types are allowed. Set this variable to the empty string to disallow + # creation of new channels by local clients at all. + ;AllowedChannelTypes = #&+ + # Are remote IRC operators allowed to control this server, e.g. # use commands like CONNECT, SQUIT, DIE, ...? ;AllowRemoteOper = no @@ -209,9 +215,6 @@ # character prepended to their respective user names! ;PAMIsOptional = no - # Allow Pre-Defined Channels only (see Section [Channels]) - ;PredefChannelsOnly = no - # Let ngIRCd send an "authentication PING" when a new client connects, # and register this client only after receiving the corresponding # "PONG" reply. diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index 64acd92..c9d7bf8 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -209,6 +209,12 @@ Optional features and configuration options to further tweak the behavior of ngIRCd. If you want to get started quickly, you most probably don't have to make changes here -- they are all optional. .TP +\fBAllowedChannelTypes\fR (string) +List of allowed channel types (channel prefixes) for newly created channels +on the local server. By default, all supported channel types are allowed. +Set this variable to the empty string to disallow creation of new channels +by local clients at all. Default: #&+ +.TP \fBAllowRemoteOper\fR (boolean) Are IRC operators connected to remote servers allowed to control this server, e.g. are they allowed to use administrative commands like CONNECT, DIE, @@ -319,12 +325,6 @@ able to distinguish between Ident'ified and PAM-authenticated users: both don't have a "~" character prepended to their respective user names! Default: no. .TP -\fBPredefChannelsOnly\fR (boolean) -If enabled, no new channels can be created. Useful if you do not want to have -other channels than those defined in [Channel] sections in the configuration -file on this server. -Default: no. -.TP \fBRequireAuthPing\fR (boolean) Let ngIRCd send an "authentication PING" when a new client connects, and register this client only after receiving the corresponding "PONG" reply. diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index bae5fa7..70c9609 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -391,6 +391,7 @@ Conf_Test( void ) puts(""); puts("[OPTIONS]"); + printf(" AllowedChannelTypes = %s\n", Conf_AllowedChannelTypes); printf(" AllowRemoteOper = %s\n", yesno_to_str(Conf_AllowRemoteOper)); printf(" ChrootDir = %s\n", Conf_Chroot); printf(" CloakHost = %s\n", Conf_CloakHost); @@ -415,7 +416,6 @@ Conf_Test( void ) printf(" PAM = %s\n", yesno_to_str(Conf_PAM)); printf(" PAMIsOptional = %s\n", yesno_to_str(Conf_PAMIsOptional)); #endif - printf(" PredefChannelsOnly = %s\n", yesno_to_str(Conf_PredefChannelsOnly)); #ifndef STRICT_RFC printf(" RequireAuthPing = %s\n", yesno_to_str(Conf_AuthPing)); #endif @@ -758,6 +758,8 @@ Set_Defaults(bool InitServers) Conf_PongTimeout = 20; /* Options */ + strlcpy(Conf_AllowedChannelTypes, CHANTYPES, + sizeof(Conf_AllowedChannelTypes)); Conf_AllowRemoteOper = false; #ifndef STRICT_RFC Conf_AuthPing = false; @@ -792,7 +794,6 @@ Set_Defaults(bool InitServers) Conf_PAM = false; #endif Conf_PAMIsOptional = false; - Conf_PredefChannelsOnly = false; #ifdef SYSLOG Conf_ScrubCTCP = false; #ifdef LOG_LOCAL5 @@ -1633,12 +1634,37 @@ static void Handle_OPTIONS(const char *File, int Line, char *Var, char *Arg) { size_t len; + char *p; assert(File != NULL); assert(Line > 0); assert(Var != NULL); assert(Arg != NULL); + if (strcasecmp(Var, "AllowedChannelTypes") == 0) { + p = Arg; + Conf_AllowedChannelTypes[0] = '\0'; + while (*p) { + if (strchr(Conf_AllowedChannelTypes, *p)) { + /* Prefix is already included; ignore it */ + p++; + continue; + } + + if (strchr(CHANTYPES, *p)) { + len = strlen(Conf_AllowedChannelTypes) + 1; + assert(len < sizeof(Conf_AllowedChannelTypes)); + Conf_AllowedChannelTypes[len - 1] = *p; + Conf_AllowedChannelTypes[len] = '\0'; + } else { + Config_Error(LOG_WARNING, + "%s, line %d: Unknown channel prefix \"%c\" in \"AllowedChannelTypes\"!", + File, Line, *p); + } + p++; + } + return; + } if (strcasecmp(Var, "AllowRemoteOper") == 0) { Conf_AllowRemoteOper = Check_ArgIsTrue(Arg); return; @@ -1731,7 +1757,19 @@ Handle_OPTIONS(const char *File, int Line, char *Var, char *Arg) return; } if (strcasecmp(Var, "PredefChannelsOnly") == 0) { - Conf_PredefChannelsOnly = Check_ArgIsTrue(Arg); + /* + * TODO: This section and support for "PredefChannelsOnly" + * could be removed starting with ngIRCd release 22 (one + * release after marking it "deprecated") ... + */ + Config_Error(LOG_WARNING, + "%s, line %d (section \"Options\"): \"%s\" is deprecated, please use \"AllowedChannelTypes\"!", + File, Line, Var); + if (Check_ArgIsTrue(Arg)) + Conf_AllowedChannelTypes[0] = '\0'; + else + strlcpy(Conf_AllowedChannelTypes, CHANTYPES, + sizeof(Conf_AllowedChannelTypes)); return; } #ifndef STRICT_RFC diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index bbf4f36..93d6785 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -148,8 +148,8 @@ GLOBAL CONF_SERVER Conf_Server[MAX_SERVERS]; /** Array of pre-defined channels */ GLOBAL array Conf_Channels; -/** Flag indicating if only pre-defined channels are allowed (true) or not */ -GLOBAL bool Conf_PredefChannelsOnly; +/** String containing all locally allowed channel prefixes for new channels */ +GLOBAL char Conf_AllowedChannelTypes[8]; /** Flag indicating if IRC operators are allowed to always use MODE (true) */ GLOBAL bool Conf_OperCanMode; diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index c683640..16501be 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -344,7 +344,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) } chan = Channel_Search(channame); - if (!chan && Conf_PredefChannelsOnly) { + if (!chan && !strchr(Conf_AllowedChannelTypes, channame[0])) { /* channel must be created, but forbidden by config */ IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG, Client_ID(Client), channame);

1 0

Alexander Barton : Merge branch 'bug152-AllowedChannelTypes'
by alex＠arthur.barton.de 04 Aug '13

04 Aug '13

Module: ngircd.git Branch: master Commit: 139f5961a078dfd23a469d98c3942f42595854aa URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=139f5961… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 4 14:11:12 2013 +0200 Merge branch 'bug152-AllowedChannelTypes' * bug152-AllowedChannelTypes: Implement new configuration option "AllowedChannelTypes" Introduce "CHANTYPES" #define ---

1 0