- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Debian init script: test for binary after reading defaults
by alex＠arthur.barton.de 19 Aug '13

19 Aug '13

Module: ngircd.git Branch: master Commit: e2f09213bcef479e7b3a35d67b1cc6b76f2205fb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e2f09213… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 19 23:31:10 2013 +0200 Debian init script: test for binary after reading defaults This allows the system administrator to overwrite the DAEMON variable in /etc/defaults/<name> and to use this init script even when the default "/usr/sbin/ngircd" doesn't exist on the system. --- contrib/Debian/ngircd.default | 2 -- contrib/Debian/ngircd.init | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/contrib/Debian/ngircd.default b/contrib/Debian/ngircd.default index 5b6c93f..add278f 100644 --- a/contrib/Debian/ngircd.default +++ b/contrib/Debian/ngircd.default @@ -1,8 +1,6 @@ # # Defaults for ngIRCd start and stop script # -# $Id: ngircd.default,v 1.1 2003/12/31 17:20:11 alex Exp $ -# # Parameters to pass to the ngircd daemon on startup, see ngircd(8) for # possible options (default: empty). diff --git a/contrib/Debian/ngircd.init b/contrib/Debian/ngircd.init index 6a418d7..8639e22 100755 --- a/contrib/Debian/ngircd.init +++ b/contrib/Debian/ngircd.init @@ -1,7 +1,7 @@ #!/bin/sh # # ngIRCd start and stop script for Debian-based systems -# Copyright 2008-2010 Alexander Barton <alex(a)barton.de> +# Copyright 2008-2013 Alexander Barton <alex(a)barton.de> # ### BEGIN INIT INFO @@ -24,13 +24,13 @@ PARAMS="" STARTTIME=1 DIETIME=10 -test -x $DAEMON || exit 5 - test -h "$0" && me=`readlink $0` || me="$0" BASENAME=`basename $me` test -r /etc/default/$BASENAME && . /etc/default/$BASENAME +test -x $DAEMON || exit 5 + # LSB compatibility functions that become used if there is no local # include file available. log_daemon_msg() {

1 0

Alexander Barton : Make SSL-related log messages more readable
by alex＠arthur.barton.de 17 Aug '13

17 Aug '13

Module: ngircd.git Branch: master Commit: a919e02ba1670277fd5a501e8c112b7c5e9771ac URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a919e02b… Author: Alexander Barton <alex(a)barton.de> Date: Wed Aug 14 10:56:09 2013 +0200 Make SSL-related log messages more readable - Don't use internal function names but describe the error. - Streamline wording, use "SSL" for SSL and TLS. - Streamline punctuation. --- src/ngircd/conn-ssl.c | 108 ++++++++++++++++++++++++++++++------------------- 1 file changed, 66 insertions(+), 42 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=a919…

1 0

Alexander Barton : ConnSSL_HandleError: Code cleanup, more documentation
by alex＠arthur.barton.de 17 Aug '13

17 Aug '13

Module: ngircd.git Branch: master Commit: dd4c60cf392ecabeeadd616c7fc561af87a7cef5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=dd4c60cf… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 12 23:12:37 2013 +0200 ConnSSL_HandleError: Code cleanup, more documentation --- src/ngircd/conn-ssl.c | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index 0bca933..1721aac 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -488,16 +488,23 @@ ConnSSL_PrepareConnect(CONNECTION *c, UNUSED CONF_SERVER *s) } -/* - Check an Handle Error return code after failed calls to ssl/tls functions. - OpenSSL: - SSL_connect(), SSL_accept(), SSL_do_handshake(), SSL_read(), SSL_peek(), or SSL_write() on ssl. - GNUTLS: - gnutlsssl_read(), gnutls_write() or gnutls_handshake(). - Return: -1 on fatal error, 0 if we can try again later. +/** + * Check and handle error return codes after failed calls to SSL/TLS functions. + * + * OpenSSL: + * SSL_connect(), SSL_accept(), SSL_do_handshake(), SSL_read(), SSL_peek(), or + * SSL_write() on ssl. + * + * GNUTLS: + * gnutlsssl_read(), gnutls_write() or gnutls_handshake(). + * + * @param c The connection handle. + * @prarm code The return code. + * @param fname The name of the function in which the error occurred. + * @return -1 on fatal errors, 0 if we can try again later. */ static int -ConnSSL_HandleError( CONNECTION *c, const int code, const char *fname ) +ConnSSL_HandleError(CONNECTION * c, const int code, const char *fname) { #ifdef HAVE_LIBSSL int ret = SSL_ERROR_SYSCALL; @@ -518,21 +525,22 @@ ConnSSL_HandleError( CONNECTION *c, const int code, const char *fname ) case SSL_ERROR_ZERO_RETURN: LogDebug("TLS/SSL connection shut down normally"); break; - /* - SSL_ERROR_WANT_CONNECT, SSL_ERROR_WANT_ACCEPT, SSL_ERROR_WANT_X509_LOOKUP - */ case SSL_ERROR_SYSCALL: + /* SSL_ERROR_WANT_CONNECT, SSL_ERROR_WANT_ACCEPT, + * and SSL_ERROR_WANT_X509_LOOKUP */ sslerr = ERR_get_error(); if (sslerr) { - Log( LOG_ERR, "%s: %s", fname, ERR_error_string(sslerr, NULL )); + Log(LOG_ERR, "%s: %s", fname, + ERR_error_string(sslerr, NULL)); } else { switch (code) { /* EOF that violated protocol */ case 0: - Log(LOG_ERR, "%s: Client Disconnected", fname ); + Log(LOG_ERR, "%s: Client Disconnected", fname); break; - case -1: /* low level socket I/O error, check errno */ - Log(LOG_ERR, "%s: %s", fname, strerror(real_errno)); + case -1: /* low level socket I/O error, check errno */ + Log(LOG_ERR, "%s: %s", fname, + strerror(real_errno)); } } break; @@ -540,7 +548,7 @@ ConnSSL_HandleError( CONNECTION *c, const int code, const char *fname ) LogOpenSSLError("TLS/SSL Protocol Error", fname); break; default: - Log( LOG_ERR, "%s: Unknown error %d!", fname, ret); + Log(LOG_ERR, "%s: Unknown error %d!", fname, ret); } ConnSSL_Free(c); return -1;

1 0

Alexander Barton : Merge branch 'ssl-log-messages'
by alex＠arthur.barton.de 17 Aug '13

17 Aug '13

Module: ngircd.git Branch: master Commit: c8b12af1d2d155ec79dc2044a4ff177cf07de4fe URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c8b12af1… Author: Alexander Barton <alex(a)barton.de> Date: Sat Aug 17 22:05:59 2013 +0200 Merge branch 'ssl-log-messages' * ssl-log-messages: Make SSL-related log messages more readable ConnSSL_HandleError: Code cleanup, more documentation ---

1 0

Federico G. Schwindt : Use _IRC_ARGC_BETWEEN_OR_RETURN_ when possible
by alex＠arthur.barton.de 14 Aug '13

14 Aug '13

Module: ngircd.git Branch: master Commit: b081cfb628d8a1d8d8c9c8eec7606ad0e3ff8584 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b081cfb6… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Tue Aug 13 18:06:34 2013 +0100 Use _IRC_ARGC_BETWEEN_OR_RETURN_ when possible --- src/ngircd/irc-channel.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 0978a19..78332ea 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -309,8 +309,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) assert (Client != NULL); assert (Req != NULL); - _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1) - _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2) + _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2) _IRC_GET_SENDER_OR_RETURN_(target, Req, Client) /* Is argument "0"? */ @@ -438,8 +437,7 @@ IRC_PART(CLIENT * Client, REQUEST * Req) assert(Client != NULL); assert(Req != NULL); - _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1) - _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2) + _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2) _IRC_GET_SENDER_OR_RETURN_(target, Req, Client) /* Loop over all the given channel names */ @@ -483,8 +481,7 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) IRC_SetPenalty(Client, 1); - _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1) - _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2) + _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2) _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) chan = Channel_Search(Req->argv[0]);

1 0

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