August 2010 - ngIRCd GIT Updates

Alexander Barton : Update ChangeLog and NEWS in preparation for the next release ...
by alex＠arthur.barton.de 29 Aug '10

29 Aug '10

Module: ngircd.git Branch: master Commit: 4833f9e5c8cdc9440fa86ed53ca50099b7139a18 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4833f9e5… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 29 18:10:49 2010 +0200 Update ChangeLog and NEWS in preparation for the next release ... --- ChangeLog | 33 +++++++++++++++++++++++++++++++++ NEWS | 15 +++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index d40a2be..2fca3a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,39 @@ -- ChangeLog -- +ngIRCd Release 17 + + - configure script: correctly indent IPv6 yes/no summary output. + - Don't reset My_Connections[Idx].lastping when reading data, so the + client lag debug-output is working again. + - Implement user mode "x": hostname cloaking (closes: #102). + - Make configure switch "--docdir" work (closes: #108). + - Reformat and update FAQ.txt a little bit. + - INSTALL: mention SSL, IPv6, and changed handling of MotdFile. + - Change MOTD file handling: ngIRCd now caches the contens of the MOTD + file, so the daemon now requires a HUP signal or REHASH command to + re-read the MOTD file when its content changed. + - Startup: open /dev/null before chroot'ing the daemon. + - Allow IRC ops to change channel modes even without OperServerMode set. + - Allow IRC operators to use MODE command on any channel (closes: #100). + - Added mailmap file for git-[short]log and git-blame. + - Authenticated users should be registered without the "~" mark. + - Set NoPAM=yes in configuration files used for the testsuite. + - New configuration option "NoPAM" to disable PAM. + - Implement asynchronous user authentication using PAM, please see the + file doc/PAM.txt for details. + - Resolver: Implement signal handler and catch TERM signals. + - Don't set a penalty time when doing DNS lookups. + - Add some documentation for using BOPM with ngIRCd, see doc/Bopm.txt. + - Implement user mode "c": receive connect/disconnect NOTICEs. Note that + this new mode requires the user to be an IRC operator. + - ngircd.init: require "$network" and "$remote_fs" when stopping ngircd. + - Show SSL status in WHOIS output, numeric 275. + - Include correct header files when testing for arpa/inet.h (Closes: #105). + - Don't access already freed memory in IRC_KILL(). + - Fix "beeing" typo ... + - SSL/TLS: fix bogus "socket closed" error message. + ngIRCd Release 16 (2010-05-02) - doc/SSL: remove line continuation marker diff --git a/NEWS b/NEWS index 3d81baf..a4c1a11 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,21 @@ -- NEWS -- +ngIRCd Release 17 + + - Implement user mode "x": hostname cloaking (closes: #102). + - Change MOTD file handling: ngIRCd now caches the contens of the MOTD + file, so the daemon now requires a HUP signal or REHASH command to + re-read the MOTD file when its content changed. + - Allow IRC ops to change channel modes even without OperServerMode set. + - Allow IRC operators to use MODE command on any channel (closes: #100). + - New configuration option "NoPAM" to disable PAM. + - Implement asynchronous user authentication using PAM, please see the + file doc/PAM.txt for details. + - Implement user mode "c": receive connect/disconnect NOTICEs. Note that + this new mode requires the user to be an IRC operator. + - Show SSL status in WHOIS output, numeric 275. + ngIRCd Release 16 (2010-05-02) ngIRCd 16~rc2 (2010-04-25)

1 0

Alexander Barton : Fix linebreak in INSTALL text to fit in 80 columns
by alex＠arthur.barton.de 29 Aug '10

29 Aug '10

Module: ngircd.git Branch: master Commit: 90a186158be1c9bdfdb35d62381b89f718c65b93 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=90a18615… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 29 18:09:57 2010 +0200 Fix linebreak in INSTALL text to fit in 80 columns --- INSTALL | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL b/INSTALL index b2c8180..f7e51a1 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ ngIRCd - Next Generation IRC Server - (c)2001-2007 Alexander Barton, + (c)2001-2010 Alexander Barton, alex(a)barton.de, http://www.barton.de/ ngIRCd is free software and published under the @@ -15,8 +15,8 @@ I. Upgrade Information Differences to version 16 -- Changes to the "MotdFile" specified in ngircd.conf now require a ngircd configuration - reload to take effect. +- Changes to the "MotdFile" specified in ngircd.conf now require a ngircd + configuration reload to take effect (HUP signal, REHASH command). Differences to version 0.9.x

1 0

Alexander Barton : configure: correctly indent IPv6 yes/no summary output
by alex＠arthur.barton.de 29 Aug '10

29 Aug '10

Module: ngircd.git Branch: master Commit: b52d5e2a78c669eccdee1291714f7bd420c9b74c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b52d5e2a… Author: Alexander Barton <alex(a)barton.de> Date: Wed Aug 25 00:02:06 2010 +0200 configure: correctly indent IPv6 yes/no summary output --- configure.in | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index bdc08e1..7c5d0b6 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2009 Alexander Barton <alex(a)barton.de> +# Copyright (c)2001-2010 Alexander Barton <alex(a)barton.de> # # 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 @@ -684,7 +684,9 @@ echo $ECHO_N " I/O backend: $ECHO_C" echo "\"$x_io_backend\"" echo $ECHO_N " IPv6 protocol: $ECHO_C" -echo $ECHO_N "$x_ipv6_on $ECHO_C" +test "$x_ipv6_on" = "yes" \ + && echo $ECHO_N "yes $ECHO_C" \ + || echo $ECHO_N "no $ECHO_C" echo $ECHO_N " SSL support: $ECHO_C" echo "$x_ssl_lib"

1 0

Alexander Barton : Don't reset My_Connections[Idx]. lastping when reading data
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: 04e38f17ae671f84b93e06c6eefa9235dd71d6ce URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=04e38f17… Author: Alexander Barton <alex(a)barton.de> Date: Thu Aug 19 15:58:55 2010 +0200 Don't reset My_Connections[Idx].lastping when reading data This fixes PING-PONG lag calculation (which resulted in "0" before). The "lastping" time is still reset it if a time shift backwards has been detected to prevent the daemon from miscalculating ping timeouts. --- src/ngircd/conn.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 58a3cbf..d0548c9 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1507,7 +1507,7 @@ Read_Request( CONN_ID Idx ) * registered as a user, server or service connection. Don't update * otherwise, so users have at least Conf_PongTimeout seconds time to * register with the IRC server -- see Check_Connections(). - * Set "lastping", too, so we can handle time shifts backwards ... */ + * Update "lastping", too, if time shifted backwards ... */ c = Conn_GetClient(Idx); if (c && (Client_Type(c) == CLIENT_USER || Client_Type(c) == CLIENT_SERVER @@ -1517,7 +1517,8 @@ Read_Request( CONN_ID Idx ) My_Connections[Idx].bps = 0; My_Connections[Idx].lastdata = t; - My_Connections[Idx].lastping = My_Connections[Idx].lastdata; + if (My_Connections[Idx].lastping > t) + My_Connections[Idx].lastping = t; } /* Look at the data in the (read-) buffer of this connection */

1 0

Alexander Barton : write_whoreply(): respect hostname cloaking
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: 32188d821b24198e4f6b5283fec1060b6700b66b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=32188d82… Author: Alexander Barton <alex(a)barton.de> Date: Wed Aug 18 00:01:14 2010 +0200 write_whoreply(): respect hostname cloaking --- src/ngircd/irc-info.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 3da4c83..905799e 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -728,9 +728,11 @@ IRC_VERSION( CLIENT *Client, REQUEST *Req ) static bool write_whoreply(CLIENT *Client, CLIENT *c, const char *channelname, const char *flags) { - return IRC_WriteStrClient(Client, RPL_WHOREPLY_MSG, Client_ID(Client), channelname, - Client_User(c), Client_Hostname(c), Client_ID(Client_Introducer(c)), Client_ID(c), - flags, Client_Hops(c), Client_Info(c)); + return IRC_WriteStrClient(Client, RPL_WHOREPLY_MSG, Client_ID(Client), + channelname, Client_User(c), + Client_HostnameCloaked(c), + Client_ID(Client_Introducer(c)), Client_ID(c), + flags, Client_Hops(c), Client_Info(c)); } @@ -1329,7 +1331,6 @@ IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan ) } /* IRC_Send_NAMES */ - /** * Send the ISUPPORT numeric (005). * This numeric indicates the features that are supported by this server.

1 0

Alexander Barton : IRC_USERHOST(): Code cleanup & some documentation
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: a51670005fde772c2b967bfb6a1166a05c1f5c33 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a5167000… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 23:55:40 2010 +0200 IRC_USERHOST(): Code cleanup & some documentation --- src/ngircd/irc-info.c | 55 ++++++++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 23 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 74530f7..d0dca7f 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -627,42 +627,51 @@ IRC_TIME( CLIENT *Client, REQUEST *Req ) } /* IRC_TIME */ +/** + * Handler for the IRC command "USERHOST". + * See RFC 2812 section 4.8. + */ GLOBAL bool -IRC_USERHOST( CLIENT *Client, REQUEST *Req ) +IRC_USERHOST(CLIENT *Client, REQUEST *Req) { char rpl[COMMAND_LEN]; CLIENT *c; int max, i; - assert( Client != NULL ); - assert( Req != NULL ); + assert(Client != NULL); + assert(Req != NULL); - if(( Req->argc < 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + if ((Req->argc < 1)) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); - if( Req->argc > 5 ) max = 5; - else max = Req->argc; + if (Req->argc > 5) + max = 5; + else + max = Req->argc; - strlcpy( rpl, RPL_USERHOST_MSG, sizeof rpl ); - for( i = 0; i < max; i++ ) - { - c = Client_Search( Req->argv[i] ); - if( c && ( Client_Type( c ) == CLIENT_USER )) - { + strlcpy(rpl, RPL_USERHOST_MSG, sizeof rpl); + for (i = 0; i < max; i++) { + c = Client_Search(Req->argv[i]); + if (c && (Client_Type(c) == CLIENT_USER)) { /* This Nick is "online" */ - strlcat( rpl, Client_ID( c ), sizeof( rpl )); - if( Client_HasMode( c, 'o' )) strlcat( rpl, "*", sizeof( rpl )); - strlcat( rpl, "=", sizeof( rpl )); - if( Client_HasMode( c, 'a' )) strlcat( rpl, "-", sizeof( rpl )); - else strlcat( rpl, "+", sizeof( rpl )); - strlcat( rpl, Client_User( c ), sizeof( rpl )); - strlcat( rpl, "@", sizeof( rpl )); - strlcat( rpl, Client_Hostname( c ), sizeof( rpl )); - strlcat( rpl, " ", sizeof( rpl )); + strlcat(rpl, Client_ID(c), sizeof(rpl)); + if (Client_HasMode(c, 'o')) + strlcat(rpl, "*", sizeof(rpl)); + strlcat(rpl, "=", sizeof(rpl)); + if (Client_HasMode(c, 'a')) + strlcat(rpl, "-", sizeof(rpl)); + else + strlcat(rpl, "+", sizeof(rpl)); + strlcat(rpl, Client_User(c), sizeof(rpl)); + strlcat(rpl, "@", sizeof(rpl)); + strlcat(rpl, Client_Hostname(c), sizeof(rpl)); + strlcat(rpl, " ", sizeof(rpl)); } } - ngt_TrimLastChr( rpl, ' '); + ngt_TrimLastChr(rpl, ' '); - return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) ); + return IRC_WriteStrClient(Client, rpl, Client_ID(Client)); } /* IRC_USERHOST */

1 0

Alexander Barton : IRC_USERHOST(): respect hostname cloaking
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: 6f4a348b753d8a4ddb5a2dc40578807d4722e0c6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6f4a348b… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 23:56:36 2010 +0200 IRC_USERHOST(): respect hostname cloaking --- src/ngircd/irc-info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index d0dca7f..3da4c83 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -665,7 +665,7 @@ IRC_USERHOST(CLIENT *Client, REQUEST *Req) strlcat(rpl, "+", sizeof(rpl)); strlcat(rpl, Client_User(c), sizeof(rpl)); strlcat(rpl, "@", sizeof(rpl)); - strlcat(rpl, Client_Hostname(c), sizeof(rpl)); + strlcat(rpl, Client_HostnameCloaked(c), sizeof(rpl)); strlcat(rpl, " ", sizeof(rpl)); } }

1 0

Alexander Barton : Send_Message(): respect hostname cloaking
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: 0263fa4c6623478d0ff6680b65bfcadd25f5f6df URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0263fa4c… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 21:15:58 2010 +0200 Send_Message(): respect hostname cloaking --- src/ngircd/irc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index a1d073c..75af321 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -412,7 +412,7 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) if (nick != NULL && host != NULL) { if (strcmp(nick, Client_ID(cl)) == 0 && strcmp(user, Client_User(cl)) == 0 && - strcasecmp(host, Client_Hostname(cl)) == 0) + strcasecmp(host, Client_HostnameCloaked(cl)) == 0) break; else continue; @@ -420,7 +420,7 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) if (strcasecmp(user, Client_User(cl)) != 0) continue; if (host != NULL && strcasecmp(host, - Client_Hostname(cl)) != 0) + Client_HostnameCloaked(cl)) != 0) continue; if (server != NULL && strcasecmp(server, Client_ID(Client_Introducer(cl))) != 0)

1 0

Alexander Barton : IRC_WriteStrClientPrefix() / Get_Prefix(): respect hostname cloaking
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: 31ea0f8ee963087728558e55298ff519c956d4f3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=31ea0f8e… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 21:14:51 2010 +0200 IRC_WriteStrClientPrefix() / Get_Prefix(): respect hostname cloaking --- src/ngircd/irc-write.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c index fdc0488..07aadf4 100644 --- a/src/ngircd/irc-write.c +++ b/src/ngircd/irc-write.c @@ -104,7 +104,8 @@ va_dcl vsnprintf( buffer, 1000, Format, ap ); va_end( ap ); - return Conn_WriteStr( Client_Conn( Client_NextHop( Client )), ":%s %s", Get_Prefix( Client_NextHop( Client ), Prefix ), buffer ); + return Conn_WriteStr(Client_Conn(Client_NextHop(Client)), ":%s %s", + Get_Prefix(Client_NextHop(Client), Prefix), buffer); } /* IRC_WriteStrClientPrefix */ @@ -449,13 +450,15 @@ IRC_SetPenalty( CLIENT *Client, time_t Seconds ) static const char * -Get_Prefix( CLIENT *Target, CLIENT *Client ) +Get_Prefix(CLIENT *Target, CLIENT *Client) { - assert( Target != NULL ); - assert( Client != NULL ); + assert (Target != NULL); + assert (Client != NULL); - if( Client_Type( Target ) == CLIENT_SERVER ) return Client_ID( Client ); - else return Client_Mask( Client ); + if (Client_Type(Target) == CLIENT_SERVER) + return Client_ID(Client); + else + return Client_MaskCloaked(Client); } /* Get_Prefix */

1 0

Alexander Barton : Refactor IRC_WriteStr{Channel|Related}Prefix(); support cloaking
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: fd4dfccc30fdbb61120e3c51f4b987cc725b603d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fd4dfccc… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 21:11:37 2010 +0200 Refactor IRC_WriteStr{Channel|Related}Prefix(); support cloaking Move common code to new local function Send_Marked_Connections() and respect hostname cloaking. --- src/ngircd/irc-write.c | 55 ++++++++++++++++++++++++----------------------- 1 files changed, 28 insertions(+), 27 deletions(-) diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c index dd592f0..fdc0488 100644 --- a/src/ngircd/irc-write.c +++ b/src/ngircd/irc-write.c @@ -39,6 +39,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)); #ifdef PROTOTYPES @@ -159,7 +160,6 @@ const char *Format; va_dcl #endif { - bool ok = CONNECTED; char buffer[1000]; CL2CHAN *cl2chan; CONN_ID conn; @@ -201,19 +201,7 @@ va_dcl } cl2chan = Channel_NextMember( Chan, cl2chan ); } - - conn = Conn_First( ); - while( conn != NONE ) - { - /* do we need to send data via this connection? */ - if( Conn_Flag( conn ) == SEND_TO_SERVER) ok = Conn_WriteStr( conn, ":%s %s", Client_ID( Prefix ), buffer ); - else if( Conn_Flag( conn ) == SEND_TO_USER ) ok = Conn_WriteStr( conn, ":%s %s", Client_Mask( Prefix ), buffer ); - if( ! ok ) break; - - conn = Conn_Next( conn ); - } - - return ok; + return Send_Marked_Connections(Prefix, buffer); } /* IRC_WriteStrChannelPrefix */ @@ -346,7 +334,6 @@ const char *Format; va_dcl #endif { - bool ok = CONNECTED; CL2CHAN *chan_cl2chan, *cl2chan; char buffer[1000]; CHANNEL *chan; @@ -394,18 +381,7 @@ va_dcl chan_cl2chan = Channel_NextChannelOf( Client, chan_cl2chan ); } - - conn = Conn_First( ); - while( conn != NONE ) - { - /* send data via this connection? */ - if( Conn_Flag( conn ) == SEND_TO_SERVER ) ok = Conn_WriteStr( conn, ":%s %s", Client_ID( Prefix ), buffer ); - else if( Conn_Flag( conn ) == SEND_TO_USER ) ok = Conn_WriteStr( conn, ":%s %s", Client_Mask( Prefix ), buffer ); - if( ! ok ) break; - - conn = Conn_Next( conn ); - } - return ok; + return Send_Marked_Connections(Prefix, buffer); } /* IRC_WriteStrRelatedPrefix */ @@ -490,4 +466,29 @@ cb_writeStrServersPrefixFlag(CLIENT *Client, CLIENT *Prefix, void *Buffer) } /* cb_writeStrServersPrefixFlag */ +static bool +Send_Marked_Connections(CLIENT *Prefix, const char *Buffer) +{ + CONN_ID conn; + bool ok = CONNECTED; + + assert(Prefix != NULL); + assert(Buffer != NULL); + + conn = Conn_First(); + while (conn != NONE) { + if (Conn_Flag(conn) == SEND_TO_SERVER) + ok = 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 = Conn_Next( conn ); + } + return ok; +} + + /* -eof- */

1 0