- ngIRCd GIT Updates - lists.barton.de

Florian Westphal : SSL/TLS: fix bogus 'socket closed' error message
by fw＠arthur.barton.de 07 Mai '10

07 Mai '10

Module: ngircd.git Branch: master Commit: df359835d1f8679b5d8a07c83bffe78008e85834 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=df359835… Author: Florian Westphal <fw(a)strlen.de> Date: Fri May 7 23:25:59 2010 +0200 SSL/TLS: fix bogus 'socket closed' error message When we get there then the ssl handshake has failed, or we could not create a ssl context because ssl library initialization failed on startup. Reflect that in the log message. --- src/ngircd/conn-ssl.c | 5 +++-- src/ngircd/conn.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index ae1646c..6a0404f 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -383,9 +383,10 @@ ConnSSL_Init_SSL(CONNECTION *c) int ret; assert(c != NULL); #ifdef HAVE_LIBSSL - if (!ssl_ctx) /* NULL when library initialization failed */ + if (!ssl_ctx) { + Log(LOG_ERR, "Cannot init ssl_ctx: OpenSSL initialization failed at startup"); return false; - + } assert(c->ssl_state.ssl == NULL); c->ssl_state.ssl = SSL_new(ssl_ctx); diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 4367754..6994c8b 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -342,7 +342,7 @@ cb_clientserver_ssl(int sock, short what) case 0: return; /* EAGAIN: callback will be invoked again by IO layer */ default: - Conn_Close(idx, "Socket closed!", "SSL accept error", false); + Conn_Close(idx, "SSL accept error, closing socket", "SSL accept error", false); return; } if (what & IO_WANTREAD)

1 0

Tag rel-16: Alexander Barton : ngIRCd release 16
by alex＠arthur.barton.de 02 Mai '10

02 Mai '10

Module: ngircd.git Branch: refs/tags/rel-16 Tag: 6927f1b9a225a2932a63149d68c3ec745eba9b6b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=6927f1b9a22… Tagger: Alexander Barton <alex(a)barton.de> Date: Sun May 2 15:25:45 2010 +0200 ngIRCd release 16

1 0

Alexander Barton : ngIRCd release 16
by alex＠arthur.barton.de 02 Mai '10

02 Mai '10

Module: ngircd.git Branch: master Commit: defd7e09afb62ac71859ad910e6dd52a86fb0ae2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=defd7e09… Author: Alexander Barton <alex(a)barton.de> Date: Sun May 2 15:25:35 2010 +0200 ngIRCd release 16 --- ChangeLog | 4 +++- NEWS | 2 +- configure.in | 2 +- contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55b0c39..d40a2be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,7 +10,9 @@ -- ChangeLog -- -ngIRCd Release 16 +ngIRCd Release 16 (2010-05-02) + + - doc/SSL: remove line continuation marker ngIRCd 16~rc2 (2010-04-25) - Updated some more copyright notices, it's 2010 already :-) diff --git a/NEWS b/NEWS index 71f9f60..3d81baf 100644 --- a/NEWS +++ b/NEWS @@ -10,7 +10,7 @@ -- NEWS -- -ngIRCd Release 16 +ngIRCd Release 16 (2010-05-02) ngIRCd 16~rc2 (2010-04-25) - Enhace connection statistics counters: display total number of served diff --git a/configure.in b/configure.in index 112bad3..6d9312d 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ # -- Initialisation -- AC_PREREQ(2.50) -AC_INIT(ngircd, 16~rc2) +AC_INIT(ngircd, 16) AC_CONFIG_SRCDIR(src/ngircd/ngircd.c) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.6) diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 9da2f18..a337686 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (16-0ab1) unstable; urgency=low + + * New "upstream" release: ngIRCd 16. + + -- Alexander Barton <alex(a)barton.de> Sun, 02 May 2010 13:32:41 +0200 + ngircd (16~rc2-0ab1) unstable; urgency=low * New "upstream" release candidate 2 for ngIRCd Release 16. diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index b957517..4ecc152 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 16~rc2 +%define version 16 %define release 1 %define prefix %{_prefix}

1 0

Florian Westphal : doc/SSL: remove line continuation marker
by fw＠arthur.barton.de 01 Mai '10

01 Mai '10

Module: ngircd.git Branch: master Commit: 29d448ed637968359394b1189f3f2be8076f1134 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=29d448ed… Author: Florian Westphal <fw(a)strlen.de> Date: Sat May 1 20:29:14 2010 +0200 doc/SSL: remove line continuation marker some people got confused by the '\' line continuation marker, thus put everything in a single line, even if the line gets overly long. --- doc/SSL.txt | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/SSL.txt b/doc/SSL.txt index 7207f1b..394894a 100644 --- a/doc/SSL.txt +++ b/doc/SSL.txt @@ -49,8 +49,7 @@ Creating a self-signed certificate OpenSSL: Creating a self-signed certificate and key: - $ openssl req -newkey rsa:2048 -x509 -keyout server-key.pem \ - -out server-cert.pem -days 1461 + $ openssl req -newkey rsa:2048 -x509 -keyout server-key.pem -out server-cert.pem -days 1461 Create DH parameters (optional): $ openssl dhparam -2 -out dhparams.pem 2048 @@ -58,8 +57,7 @@ GnuTLS: Creating a self-signed certificate and key: $ certtool --generate-privkey --bits 2048 --outfile server-key.pem - $ certtool --generate-self-signed --load-privkey server-key.pem \ - --outfile server-cert.pem + $ certtool --generate-self-signed --load-privkey server-key.pem --outfile server-cert.pem Create DH parameters (optional): $ certtool --generate-dh-params --bits 2048 --outfile dhparams.pem

1 0

Tag rel-16-rc2: Alexander Barton : ngIRCd release 16~rc2
by alex＠arthur.barton.de 25 Apr '10

25 Apr '10

Module: ngircd.git Branch: refs/tags/rel-16-rc2 Tag: 7142bc144ad1be7c9efd66f8631bed4147e366c6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=7142bc144ad… Tagger: Alexander Barton <alex(a)barton.de> Date: Sun Apr 25 13:14:58 2010 +0200 ngIRCd release 16~rc2

1 0

Alexander Barton : ngIRCd release 16~rc2
by alex＠arthur.barton.de 25 Apr '10

25 Apr '10

Module: ngircd.git Branch: master Commit: bdec5ac1f37110a8456631e0155b5c9efeee35ee URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bdec5ac1… Author: Alexander Barton <alex(a)barton.de> Date: Sun Apr 25 13:13:11 2010 +0200 ngIRCd release 16~rc2 --- ChangeLog | 12 ++++++++++++ NEWS | 5 +++++ configure.in | 2 +- contrib/Debian/changelog | 8 +++++++- contrib/ngircd.spec | 2 +- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7b1303..55b0c39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,18 @@ ngIRCd Release 16 + ngIRCd 16~rc2 (2010-04-25) + - Updated some more copyright notices, it's 2010 already :-) + - Only compile in Get_Error() if really needed + - Fix gcc warning "ignoring return value of ..." + - Include netinet/in_systm.h alongside netinet/ip.h + - Include netinet/{in.h, in_systm.h} when checking for netinet/ip.h + - Only include <netinet/in_systm.h> if it exists + - Updated doc/Platforms.txt + - Enhace connection statistics counters: display total number of served + connections on daemon shutdown and when a new client connects using + the new numeric RPL_STATSCONN (250). + ngIRCd 16~rc1 (2010-03-25) - Various fixes to the build system and code cleanups. - contrib/platformtest.sh: Only show latest commit. diff --git a/NEWS b/NEWS index 7c6f948..71f9f60 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,11 @@ ngIRCd Release 16 + ngIRCd 16~rc2 (2010-04-25) + - Enhace connection statistics counters: display total number of served + connections on daemon shutdown and when a new client connects using + the new numeric RPL_STATSCONN (250). + ngIRCd 16~rc1 (2010-03-25) - Implement WEBIRC command used by some Web-IRC frontends. The password required to secure this command must be configured using the new diff --git a/configure.in b/configure.in index b053c41..112bad3 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ # -- Initialisation -- AC_PREREQ(2.50) -AC_INIT(ngircd, 16~rc1) +AC_INIT(ngircd, 16~rc2) AC_CONFIG_SRCDIR(src/ngircd/ngircd.c) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.6) diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 4bab648..9da2f18 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,8 +1,14 @@ +ngircd (16~rc2-0ab1) unstable; urgency=low + + * New "upstream" release candidate 2 for ngIRCd Release 16. + + -- Alexander Barton <alex(a)barton.de> Sun, 25 Apr 2010 13:12:42 +0200 + ngircd (16~rc1-0ab1) unstable; urgency=low * New "upstream" release candidate 1 for ngIRCd Release 16. - -- Alexander Barton <alex(a)barton.de> Thu, 25 Mar 2010 15:56:03 +0100 + -- Alexander Barton <alex(a)barton.de> Thu, 25 Mar 2010 15:56:03 +0200 ngircd (15-0ab1) unstable; urgency=low diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index d83ff70..b957517 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 16~rc1 +%define version 16~rc2 %define release 1 %define prefix %{_prefix}

1 0

Alexander Barton : New numeric RPL_STATSCONN (250): display connection statistics
by alex＠arthur.barton.de 25 Apr '10

25 Apr '10

Module: ngircd.git Branch: master Commit: 79e1ec2b1e852e16fbf72c0a1af982d866f215b6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=79e1ec2b… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 23 23:30:14 2010 +0200 New numeric RPL_STATSCONN (250): display connection statistics The RPL_STATSCONN numeric (250) displays information about the highest simoultaneous connection count and the number of all accepted connections since the daemon started up. Used by ircd-Hybrid, Bahamut, and Unreal for example. --- src/ngircd/irc-info.c | 6 +++++- src/ngircd/messages.h | 1 + 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 28722e7..7d7bb88 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -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 @@ -1176,6 +1176,10 @@ IRC_Send_LUSERS( CLIENT *Client ) if(! IRC_WriteStrClient(Client, RPL_NETUSERS_MSG, Client_ID(Client), cnt, max, cnt, max)) return DISCONNECTED; + /* Connection counters */ + if (! IRC_WriteStrClient(Client, RPL_STATSCONN_MSG, Client_ID(Client), + Conn_CountMax(), Conn_CountAccepted())) + return DISCONNECTED; #endif return CONNECTED; diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index e15bf16..c356e42 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -46,6 +46,7 @@ #define RPL_TRACEEND_MSG "262 %s %s %s-%s.%s :End of TRACE" #define RPL_LOCALUSERS_MSG "265 %s %lu %lu :Current local users: %lu, Max: %lu" #define RPL_NETUSERS_MSG "266 %s %lu %lu :Current global users: %lu, Max: %lu" +#define RPL_STATSCONN_MSG "250 %s :Highest connection count: %lu (%lu connections received)" #define RPL_AWAY_MSG "301 %s %s :%s" #define RPL_USERHOST_MSG "302 %s :"

1 0

Alexander Barton : Don't reset counters on RESTART
by alex＠arthur.barton.de 25 Apr '10

25 Apr '10

Module: ngircd.git Branch: master Commit: 73fd26e9fa708727e3f870052df0cc32e295bfc0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=73fd26e9… Author: Alexander Barton <alex(a)barton.de> Date: Sun Apr 25 12:54:13 2010 +0200 Don't reset counters on RESTART When ngIRCd restarts, all the connection counters are preserved now, as well as the command counters for example. It's unclear if resetting or not resetting is the "correct" behaviour, but it's quite clear that the behaviour should be consistent for all the counters ngIRCd uses ... And initializing "WCounter", the global but temporary write counter, is not necessarry at all: it is initialized (reset) before its use in the command parser (see parse.c). --- src/ngircd/conn.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 0861b08..4367754 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -389,10 +389,6 @@ Conn_Init( void ) for (i = 0; i < Pool_Size; i++) Init_Conn_Struct(i); - - /* Initialize global counters (required after RESTART command!) */ - NumConnections = NumConnectionsMax = NumConnectionsAccepted = 0; - WCounter = 0; } /* Conn_Init */

1 0

Alexander Barton : Conn_Init: code cleanup
by alex＠arthur.barton.de 25 Apr '10

25 Apr '10

Module: ngircd.git Branch: master Commit: 21140500f1d77bdb0912c67a5402ab7280f2ba42 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=21140500… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 23 22:23:51 2010 +0200 Conn_Init: code cleanup --- src/ngircd/conn.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 853ffe8..b95f25e 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -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 @@ -369,8 +369,8 @@ Conn_Init( void ) Pool_Size = Conf_MaxConnections; if (!array_alloc(&My_ConnArray, sizeof(CONNECTION), (size_t)Pool_Size)) { - Log( LOG_EMERG, "Can't allocate memory! [Conn_Init]" ); - exit( 1 ); + Log(LOG_EMERG, "Can't allocate memory! [Conn_Init]"); + exit(1); } /* FIXME: My_Connetions/Pool_Size is needed by other parts of the @@ -378,14 +378,15 @@ Conn_Init( void ) My_Connections = (CONNECTION*) array_start(&My_ConnArray); LogDebug("Allocated connection pool for %d items (%ld bytes).", - array_length(&My_ConnArray, sizeof( CONNECTION )), array_bytes(&My_ConnArray)); + array_length(&My_ConnArray, sizeof(CONNECTION)), + array_bytes(&My_ConnArray)); - assert( array_length(&My_ConnArray, sizeof( CONNECTION )) >= (size_t) Pool_Size); + assert(array_length(&My_ConnArray, sizeof(CONNECTION)) >= (size_t)Pool_Size); array_free( &My_Listeners ); - /* Connection-Struktur initialisieren */ - for( i = 0; i < Pool_Size; i++ ) Init_Conn_Struct( i ); + for (i = 0; i < Pool_Size; i++) + Init_Conn_Struct(i); /* Global write counter */ WCounter = 0;

1 0

Alexander Barton : Enhace connection statistics counters
by alex＠arthur.barton.de 25 Apr '10

25 Apr '10

Module: ngircd.git Branch: master Commit: 1338ade65032e5aea4891694a61d8ee3d1c795e1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1338ade6… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 23 23:25:34 2010 +0200 Enhace connection statistics counters This patch enables ngIRCd to count the highest maximum simultaneous connections and all the connections accepted since startup. New functions: - Conn_Count(): get current connections - Conn_CountMax(): maximum simultaneous connections - Conn_CountAccepted(): number of connections accepted --- src/ngircd/conn.c | 45 ++++++++++++++++++++++++++++++++++++++++----- src/ngircd/conn.h | 6 +++++- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index b95f25e..0861b08 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -95,10 +95,12 @@ static bool Init_Socket PARAMS(( int Sock )); static void New_Server PARAMS(( int Server, ng_ipaddr_t *dest )); static void Simple_Message PARAMS(( int Sock, const char *Msg )); static int NewListener PARAMS(( const char *listen_addr, UINT16 Port )); +static void Account_Connection PARAMS((void)); + static array My_Listeners; static array My_ConnArray; -static size_t NumConnections; +static size_t NumConnections, NumConnectionsMax, NumConnectionsAccepted; #ifdef TCPWRAP int allow_severity = LOG_INFO; @@ -388,7 +390,8 @@ Conn_Init( void ) for (i = 0; i < Pool_Size; i++) Init_Conn_Struct(i); - /* Global write counter */ + /* Initialize global counters (required after RESTART command!) */ + NumConnections = NumConnectionsMax = NumConnectionsAccepted = 0; WCounter = 0; } /* Conn_Init */ @@ -1102,6 +1105,27 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie } /* Conn_Close */ +GLOBAL long +Conn_Count(void) +{ + return NumConnections; +} /* Conn_Count */ + + +GLOBAL long +Conn_CountMax(void) +{ + return NumConnectionsMax; +} /* Conn_CountMax */ + + +GLOBAL long +Conn_CountAccepted(void) +{ + return NumConnectionsAccepted; +} /* Conn_CountAccepted */ + + GLOBAL void Conn_SyncServerStruct( void ) { @@ -1242,6 +1266,7 @@ New_Connection(int Sock) Log(LOG_CRIT, "Can't accept connection: %s!", strerror(errno)); return -1; } + NumConnectionsAccepted++; if (!ng_ipaddr_tostr_r(&new_addr, ip_str)) { Log(LOG_CRIT, "fd %d: Can't convert IP address!", new_sock); @@ -1361,12 +1386,22 @@ New_Connection(int Sock) * If there are results earlier, the delay is aborted. */ Conn_SetPenalty(new_sock, 4); - NumConnections++; - LogDebug("Total number of connections now %ld.", NumConnections); + Account_Connection(); return new_sock; } /* New_Connection */ +static void +Account_Connection(void) +{ + NumConnections++; + if (NumConnections > NumConnectionsMax) + NumConnectionsMax = NumConnections; + LogDebug("Total number of connections now %lu (max %lu).", + NumConnections, NumConnectionsMax); +} /* Account_Connection */ + + static CONN_ID Socket2Index( int Sock ) { @@ -1806,7 +1841,7 @@ New_Server( int Server , ng_ipaddr_t *dest) } /* Conn_Close() decrements this counter again */ - NumConnections++; + Account_Connection(); Client_SetIntroducer( c, c ); Client_SetToken( c, TOKEN_OUTBOUND ); diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index b94b10d..f2ec823 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2009 by 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 @@ -122,5 +122,9 @@ static inline bool Conn_UsesSSL(UNUSED CONN_ID Idx) { return false; } #endif #endif +GLOBAL long Conn_Count PARAMS((void)); +GLOBAL long Conn_CountMax PARAMS((void)); +GLOBAL long Conn_CountAccepted PARAMS((void)); + /* -eof- */

1 0