August 2013 - ngIRCd GIT Updates

Alexander Barton : Change log level of "SSL connection shutting down"
by alex＠arthur.barton.de 12 Aug '13

12 Aug '13

Module: ngircd.git Branch: master Commit: 4828bae8d321c6a87a724092ef0f258db7cd7e50 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4828bae8… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 12 00:02:40 2013 +0200 Change log level of "SSL connection shutting down" --- src/ngircd/conn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 86aeb65..53497e3 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1228,7 +1228,7 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie c = Conn_GetClient( Idx ); #ifdef SSL_SUPPORT if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_SSL )) { - Log(LOG_INFO, "SSL connection %d shutting down ...", Idx); + LogDebug("SSL connection %d shutting down ...", Idx); ConnSSL_Free(&My_Connections[Idx]); } #endif

1 0

Federico G. Schwindt : Fix 2 bugs introduced in 74514b8c23
by alex＠arthur.barton.de 11 Aug '13

11 Aug '13

Module: ngircd.git Branch: master Commit: cd38e9580e428103cef39e2e29f62472b2f336d3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cd38e958… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Sun Aug 11 20:57:11 2013 +0100 Fix 2 bugs introduced in 74514b8c23 Channel_Modes() and Channel_Topic() return static memory that is zeroed at creation time. Fix checking for empty modes and topic so they're propagated correctly. --- src/ngircd/irc-channel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 17ecbf9..0978a19 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -688,7 +688,7 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) return CONNECTED; if (Req->argv[1][0] == '+') { - if (!Channel_Modes(chan)) { + if (!*Channel_Modes(chan)) { /* OK, this channel doesn't have modes yet, * set the received ones: */ Channel_SetModes(chan, &Req->argv[1][1]); @@ -727,7 +727,7 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) if (arg_topic > 0) { /* We got a topic */ - if (!Channel_Topic( chan ) && 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 : configure: Don't quote IO backend type(s)
by alex＠arthur.barton.de 11 Aug '13

11 Aug '13

Module: ngircd.git Branch: master Commit: aeebde4642580e806c04a339bb9befd1ece61775 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=aeebde46… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 11 11:38:10 2013 +0200 configure: Don't quote IO backend type(s) It's not needed and inconsistent compared to the other settings. Reported by "allerbest" (Götz Hoffart) on #ngircd, thanks! --- configure.ng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ng b/configure.ng index 49fc75a..7e85225 100644 --- a/configure.ng +++ b/configure.ng @@ -702,7 +702,7 @@ test "$x_ipv6_on" = "yes" \ && echo $ECHO_N "yes $ECHO_C" \ || echo $ECHO_N "no $ECHO_C" echo $ECHO_N " I/O backend: $ECHO_C" - echo "\"$x_io_backend\"" + echo "$x_io_backend" echo $ECHO_N " PAM support: $ECHO_C" test "$x_pam_on" = "yes" \

1 0

Alexander Barton : IRC_SERVER(): Code cleanup
by alex＠arthur.barton.de 07 Aug '13

07 Aug '13

Module: ngircd.git Branch: master Commit: 298158501dd928954fa542b9a2ee0ccc9b0ab2ac URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=29815850… Author: Alexander Barton <alex(a)barton.de> Date: Wed Aug 7 00:13:08 2013 +0200 IRC_SERVER(): Code cleanup --- src/ngircd/irc-server.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index 72acf79..d1df18a 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -188,30 +188,47 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) Client_ID(Client), Req->command); /* check for existing server with same ID */ - if( ! Client_CheckID( Client, Req->argv[0] )) return DISCONNECTED; + if (!Client_CheckID(Client, Req->argv[0])) + return DISCONNECTED; from = Client_Search( Req->prefix ); - if( ! from ) - { + if (! from) { /* Uh, Server, that introduced the new server is unknown?! */ - Log( LOG_ALERT, "Unknown ID in prefix of SERVER: \"%s\"! (on connection %d)", Req->prefix, Client_Conn( Client )); - Conn_Close( Client_Conn( Client ), NULL, "Unknown ID in prefix of SERVER", true); + Log(LOG_ALERT, + "Unknown ID in prefix of SERVER: \"%s\"! (on connection %d)", + Req->prefix, Client_Conn(Client)); + Conn_Close(Client_Conn(Client), NULL, + "Unknown ID in prefix of SERVER", true); return DISCONNECTED; } - c = Client_NewRemoteServer(Client, Req->argv[0], from, atoi(Req->argv[1]), atoi(Req->argv[2]), Req->argv[3], true); + c = Client_NewRemoteServer(Client, Req->argv[0], from, + atoi(Req->argv[1]), atoi(Req->argv[2]), + Req->argv[3], true); if (!c) { - Log( LOG_ALERT, "Can't create client structure for server! (on connection %d)", Client_Conn( Client )); - Conn_Close( Client_Conn( Client ), NULL, "Can't allocate client structure for remote server", true); + Log(LOG_ALERT, + "Can't create client structure for server! (on connection %d)", + Client_Conn(Client)); + Conn_Close(Client_Conn(Client), NULL, + "Can't allocate client structure for remote server", + true); return DISCONNECTED; } - if(( Client_Hops( c ) > 1 ) && ( Req->prefix[0] )) snprintf( str, sizeof( str ), "connected to %s, ", Client_ID( from )); - else strcpy( str, "" ); - Log( LOG_NOTICE|LOG_snotice, "Server \"%s\" registered (via %s, %s%d hop%s).", Client_ID( c ), Client_ID( Client ), str, Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" ); + if (Client_Hops(c) > 1 && Req->prefix[0]) + snprintf(str, sizeof(str), "connected to %s, ", + Client_ID(from)); + else + strcpy(str, ""); + Log(LOG_NOTICE|LOG_snotice, + "Server \"%s\" registered (via %s, %s%d hop%s).", + Client_ID(c), Client_ID(Client), str, Client_Hops(c), + Client_Hops(c) > 1 ? "s": "" ); /* notify other servers */ - IRC_WriteStrServersPrefix( Client, from, "SERVER %s %d %d :%s", Client_ID( c ), Client_Hops( c ) + 1, Client_MyToken( c ), Client_Info( c )); + IRC_WriteStrServersPrefix(Client, from, "SERVER %s %d %d :%s", + Client_ID(c), Client_Hops(c) + 1, + Client_MyToken(c), Client_Info(c)); return CONNECTED; } else

1 0

Alexander Barton : Introduce new function IRC_WriteErrClient()
by alex＠arthur.barton.de 07 Aug '13

07 Aug '13

Module: ngircd.git Branch: master Commit: 904c8a4375cb9deed64007b06c6a7ba42313d93d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=904c8a43… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 6 23:37:21 2013 +0200 Introduce new function IRC_WriteErrClient() This function is used to send "error messages", including numerics, back to clients and to automatically enforce a 2 second penalty. With this patch, all error results enforces a delay for the client. All callers of IRC_WriteStrClient(ERR_xxx) have been converted. Please note that this patch prolongs the time "make check" needs to complete its tests, because of lots of new enforced penalties ... --- src/ngircd/channel.c | 30 ++++++++--------- src/ngircd/client.c | 13 ++++---- src/ngircd/irc-cap.c | 2 +- src/ngircd/irc-channel.c | 34 +++++++++---------- src/ngircd/irc-encoding.c | 6 ++-- src/ngircd/irc-info.c | 26 ++++++--------- src/ngircd/irc-login.c | 64 ++++++++++++++++------------------- src/ngircd/irc-metadata.c | 8 ++--- src/ngircd/irc-mode.c | 81 ++++++++++++++++++++++----------------------- src/ngircd/irc-op.c | 29 ++++++++++------ src/ngircd/irc-oper.c | 33 +++++++++--------- src/ngircd/irc-server.c | 12 ++++--- src/ngircd/irc-write.c | 37 +++++++++++++++++++++ src/ngircd/irc-write.h | 2 ++ src/ngircd/irc.c | 26 +++++++-------- src/ngircd/op.c | 6 ++-- src/ngircd/parse.c | 13 ++++---- 17 files changed, 228 insertions(+), 194 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=904c…

1 0

Alexander Barton : irc-macros.h: Update copyright, don' t forget contributors!
by alex＠arthur.barton.de 06 Aug '13

06 Aug '13

Module: ngircd.git Branch: master Commit: b86e33ef4945e21078b2c1f37a5d276e615450ee URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b86e33ef… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 6 23:36:10 2013 +0200 irc-macros.h: Update copyright, don't forget contributors! --- src/ngircd/irc-macros.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/irc-macros.h b/src/ngircd/irc-macros.h index abb93f0..07ccfd2 100644 --- a/src/ngircd/irc-macros.h +++ b/src/ngircd/irc-macros.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2013 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

1 0

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 : Fix return code of some IRC_WriteXXX() functions
by alex＠arthur.barton.de 06 Aug '13

06 Aug '13

Module: ngircd.git Branch: master Commit: 08d49a8fa02ef11b22d611d11c595812ce207ac8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=08d49a8f… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 6 23:16:35 2013 +0200 Fix return code of some IRC_WriteXXX() functions These functions usually write to more than one target, and therefore can't return value indicating success or failure in a sane way. And, even more omportant, these functions should send to as much as possible clients and not stop at the first client which isn't reachable any more! --- src/ngircd/channel.c | 5 +++-- src/ngircd/irc-write.c | 36 ++++++++++++++++-------------------- src/ngircd/irc-write.h | 8 ++++---- 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index c5f65fe..06b88ba 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -931,8 +931,9 @@ Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Command, if (Client_Conn(From) > NONE) Conn_UpdateIdle(Client_Conn(From)); - return IRC_WriteStrChannelPrefix(Client, Chan, From, true, - "%s %s :%s", Command, Channel_Name(Chan), Text); + IRC_WriteStrChannelPrefix(Client, Chan, From, true, "%s %s :%s", + Command, Channel_Name(Chan), Text); + return CONNECTED; } diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c index ea9b9a0..f4d4361 100644 --- a/src/ngircd/irc-write.c +++ b/src/ngircd/irc-write.c @@ -41,7 +41,7 @@ static const char *Get_Prefix PARAMS((CLIENT *Target, CLIENT *Client)); static void cb_writeStrServersPrefixFlag PARAMS((CLIENT *Client, CLIENT *Prefix, void *Buffer)); -static bool Send_Marked_Connections PARAMS((CLIENT *Prefix, const char *Buffer)); +static void Send_Marked_Connections PARAMS((CLIENT *Prefix, const char *Buffer)); #ifdef PROTOTYPES @@ -112,11 +112,11 @@ va_dcl #ifdef PROTOTYPES -GLOBAL bool +GLOBAL void IRC_WriteStrChannel(CLIENT *Client, CHANNEL *Chan, bool Remote, const char *Format, ...) #else -GLOBAL bool +GLOBAL void IRC_WriteStrChannel(Client, Chan, Remote, Format, va_alist) CLIENT *Client; CHANNEL *Chan; @@ -139,21 +139,21 @@ va_dcl vsnprintf( buffer, 1000, Format, ap ); va_end( ap ); - return IRC_WriteStrChannelPrefix( Client, Chan, Client_ThisServer( ), Remote, "%s", buffer ); + IRC_WriteStrChannelPrefix(Client, Chan, Client_ThisServer(), + Remote, "%s", buffer ); } /* IRC_WriteStrChannel */ - /** * send message to all clients in the same channel, but only send message * once per remote server. */ #ifdef PROTOTYPES -GLOBAL bool +GLOBAL void IRC_WriteStrChannelPrefix(CLIENT *Client, CHANNEL *Chan, CLIENT *Prefix, bool Remote, const char *Format, ...) #else -GLOBAL bool +GLOBAL void IRC_WriteStrChannelPrefix(Client, Chan, Prefix, Remote, Format, va_alist) CLIENT *Client; CHANNEL *Chan; @@ -204,7 +204,7 @@ va_dcl } cl2chan = Channel_NextMember( Chan, cl2chan ); } - return Send_Marked_Connections(Prefix, buffer); + Send_Marked_Connections(Prefix, buffer); } /* IRC_WriteStrChannelPrefix */ @@ -324,11 +324,11 @@ IRC_WriteStrServersPrefixFlag_CB(CLIENT *ExceptOf, CLIENT *Prefix, char Flag, * only send message once per remote server. */ #ifdef PROTOTYPES -GLOBAL bool +GLOBAL void IRC_WriteStrRelatedPrefix(CLIENT *Client, CLIENT *Prefix, bool Remote, const char *Format, ...) #else -GLOBAL bool +GLOBAL void IRC_WriteStrRelatedPrefix(Client, Prefix, Remote, Format, va_alist) CLIENT *Client; CLIENT *Prefix; @@ -384,7 +384,7 @@ va_dcl chan_cl2chan = Channel_NextChannelOf( Client, chan_cl2chan ); } - return Send_Marked_Connections(Prefix, buffer); + Send_Marked_Connections(Prefix, buffer); } /* IRC_WriteStrRelatedPrefix */ @@ -471,11 +471,10 @@ cb_writeStrServersPrefixFlag(CLIENT *Client, CLIENT *Prefix, void *Buffer) } /* cb_writeStrServersPrefixFlag */ -static bool +static void Send_Marked_Connections(CLIENT *Prefix, const char *Buffer) { CONN_ID conn; - bool ok = CONNECTED; assert(Prefix != NULL); assert(Buffer != NULL); @@ -483,16 +482,13 @@ Send_Marked_Connections(CLIENT *Prefix, const char *Buffer) conn = Conn_First(); while (conn != NONE) { if (Conn_Flag(conn) == SEND_TO_SERVER) - ok = Conn_WriteStr(conn, ":%s %s", - Client_ID(Prefix), Buffer); + Conn_WriteStr(conn, ":%s %s", + Client_ID(Prefix), Buffer); else if (Conn_Flag(conn) == SEND_TO_USER) - ok = Conn_WriteStr(conn, ":%s %s", - Client_MaskCloaked(Prefix), Buffer); - if (!ok) - break; + Conn_WriteStr(conn, ":%s %s", + Client_MaskCloaked(Prefix), Buffer); conn = Conn_Next( conn ); } - return ok; } diff --git a/src/ngircd/irc-write.h b/src/ngircd/irc-write.h index dc8dec2..ddfe2f0 100644 --- a/src/ngircd/irc-write.h +++ b/src/ngircd/irc-write.h @@ -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 @@ -21,9 +21,9 @@ GLOBAL bool IRC_WriteStrClient PARAMS((CLIENT *Client, const char *Format, ...)) GLOBAL bool IRC_WriteStrClientPrefix PARAMS((CLIENT *Client, CLIENT *Prefix, const char *Format, ...)); -GLOBAL bool IRC_WriteStrChannel PARAMS((CLIENT *Client, CHANNEL *Chan, +GLOBAL void IRC_WriteStrChannel PARAMS((CLIENT *Client, CHANNEL *Chan, bool Remote, const char *Format, ...)); -GLOBAL bool IRC_WriteStrChannelPrefix PARAMS((CLIENT *Client, CHANNEL *Chan, +GLOBAL void IRC_WriteStrChannelPrefix PARAMS((CLIENT *Client, CHANNEL *Chan, CLIENT *Prefix, bool Remote, const char *Format, ...)); GLOBAL void IRC_WriteStrServers PARAMS((CLIENT *ExceptOf, @@ -36,7 +36,7 @@ GLOBAL void IRC_WriteStrServersPrefixFlag_CB PARAMS((CLIENT *ExceptOf, CLIENT *Prefix, char Flag, void (*callback)(CLIENT *, CLIENT *, void *), void *cb_data)); -GLOBAL bool IRC_WriteStrRelatedPrefix PARAMS((CLIENT *Client, CLIENT *Prefix, +GLOBAL void IRC_WriteStrRelatedPrefix PARAMS((CLIENT *Client, CLIENT *Prefix, bool Remote, const char *Format, ...)); GLOBAL void IRC_SendWallops PARAMS((CLIENT *Client, CLIENT *From,

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