- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : New documentation: "how to contribute"
by alex＠arthur.barton.de 24 Jun '11

24 Jun '11

Module: ngircd.git Branch: master Commit: b1786f309ecc29216a8d0b919cd514c8f69f24bf URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b1786f30… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jun 24 21:01:18 2011 +0200 New documentation: "how to contribute" --- doc/Contributing.txt | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/doc/Contributing.txt b/doc/Contributing.txt new file mode 100644 index 0000000..089afd4 --- /dev/null +++ b/doc/Contributing.txt @@ -0,0 +1,54 @@ + + ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ + + (c)2001-2011 Alexander Barton and Contributors. + ngIRCd is free software and published under the + terms of the GNU General Public License. + + -- Contributing.txt -- + + +If you want to contribute to ngIRCd, please read the following paragraphs to +get an idea of how to do it the best :-) + + - Use GIT + + The source code of ngIRCd is maintained using GIT, see doc/GIT.txt. So if + remotely possible, use GIT for your work, too. It makes your and our lifes + much easier ;-) + + - Don't forget to include documentation + + When adding features and new configuration options, don't forget to not + only code the features but to describe them in doc/sample-ngircd.conf, + man/ngircd.8.tmp and/or man/ngircd.conf.5.tmpl as well! + + - Be present on IRC + + If you intend to code some new features or do some code cleanups or better + documentation, please be present on <irc://irc.barton.de/#ngircd> and + discuss your plans early! So other developers have an idea on what others + are working on, can offer help, and can synchronize their own work. + + - Check and validate your work! + + Use "make check" to validate your work, and use "make distcheck" to + validate the resulting archives, especially when adding/removing files! + + - Send patches in "unified diff" format + + Please send patches in "unified" format, that is, use "diff -u". + Or even better: use GIT ("git diff"), see above. + + - Send patches to the mailing list + + If you have some code to present, send the patch(es) and/or pointers to + your GIT repository to the official ngIRCd mailing list for review, not + only to #ngircd: so it becomes archived and more people have a chance to + review your patch. + + Sure it is a good idea to post some notes to #ngircd, too! :-) + + And this is open source, your work must not be 100% finished and perfect, + work in progress is interesting, too: "release early, release often"!

1 0

Florian Westphal : conn: fix error handling when connecting to server
by fw＠arthur.barton.de 05 Jun '11

05 Jun '11

Module: ngircd.git Branch: master Commit: 42b32f8a2adcbe0d7b011083cc0549ae89139449 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=42b32f8a… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Jun 5 15:00:32 2011 +0200 conn: fix error handling when connecting to server The io_event_create error handling seems to miss a 'return' statement. Fix this by moving io_event_create() call around so we do not need the Conn_Close/Init calls in the error case. --- src/ngircd/conn.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 26e47c1..3350e20 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1951,6 +1951,12 @@ New_Server( int Server , ng_ipaddr_t *dest) return; } + if (!io_event_create( new_sock, IO_WANTWRITE, cb_connserver)) { + Log(LOG_ALERT, "io_event_create(): could not add fd %d", strerror(errno)); + close(new_sock); + return; + } + My_Connections = array_start(&My_ConnArray); assert(My_Connections[new_sock].sock <= 0); @@ -1961,7 +1967,7 @@ New_Server( int Server , ng_ipaddr_t *dest) c = Client_NewLocal(new_sock, ip_str, CLIENT_UNKNOWNSERVER, false); if (!c) { Log( LOG_ALERT, "Can't establish connection: can't create client structure!" ); - close( new_sock ); + io_close(new_sock); return; } @@ -1978,13 +1984,6 @@ New_Server( int Server , ng_ipaddr_t *dest) strlcpy( My_Connections[new_sock].host, Conf_Server[Server].host, sizeof(My_Connections[new_sock].host )); - /* Register new socket */ - if (!io_event_create( new_sock, IO_WANTWRITE, cb_connserver)) { - Log( LOG_ALERT, "io_event_create(): could not add fd %d", strerror(errno)); - Conn_Close( new_sock, "io_event_create() failed", NULL, false ); - Init_Conn_Struct( new_sock ); - Conf_Server[Server].conn_id = NONE; - } #ifdef SSL_SUPPORT if (Conf_Server[Server].SSLConnect && !ConnSSL_PrepareConnect( &My_Connections[new_sock], &Conf_Server[Server] )) @@ -2025,9 +2024,10 @@ Init_Conn_Struct(CONN_ID Idx) * Initialize options of a new socket. * * For example, we try to set socket options SO_REUSEADDR and IPTOS_LOWDELAY. - * Errors shouldn't be fatal and therefore are ignored. + * The socket is automatically closed if a fatal error is encountered. * * @param Sock Socket handle. + * @returns false if socket was closed due to fatal error. */ static bool Init_Socket( int Sock )

1 0

Florian Westphal : ssl: gnutls: bump dh bitsize to 2048
by fw＠arthur.barton.de 04 Jun '11

04 Jun '11

Module: ngircd.git Branch: master Commit: 49b2d0ec98d001fbc8eedd5a183d66974f70fd52 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=49b2d0ec… Author: Florian Westphal <fw(a)strlen.de> Date: Sat Jun 4 22:57:29 2011 +0200 ssl: gnutls: bump dh bitsize to 2048 problem is that some clients refuse to connect to severs that only offer 1024. For interoperability it would be best to just use 4096, but that takes minutes, even on current hardware. --- doc/SSL.txt | 4 ++-- src/ngircd/conn-ssl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/SSL.txt b/doc/SSL.txt index 394894a..b98c2fb 100644 --- a/doc/SSL.txt +++ b/doc/SSL.txt @@ -51,7 +51,7 @@ OpenSSL: Creating a self-signed certificate and key: $ 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 + $ openssl dhparam -2 -out dhparams.pem 4096 GnuTLS: @@ -59,7 +59,7 @@ 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 Create DH parameters (optional): - $ certtool --generate-dh-params --bits 2048 --outfile dhparams.pem + $ certtool --generate-dh-params --bits 4096 --outfile dhparams.pem Alternate approach using stunnel(1) diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index edcc5bd..7630420 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -51,7 +51,7 @@ static bool ConnSSL_LoadServerKey_openssl PARAMS(( SSL_CTX *c )); #include <unistd.h> #include <gnutls/x509.h> -#define DH_BITS 1024 +#define DH_BITS 2048 static gnutls_certificate_credentials_t x509_cred; static gnutls_dh_params_t dh_params;

1 0

Alexander Barton : Mac OS X: split up make targets
by alex＠arthur.barton.de 12 Mai '11

12 Mai '11

Module: ngircd.git Branch: master Commit: dd7d64f577633d68a11b6dc0e97ec00df0645343 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=dd7d64f5… Author: Alexander Barton <alex(a)barton.de> Date: Thu May 12 00:21:18 2011 +0200 Mac OS X: split up make targets New targets are: "have-packagemaker", "osxpkg-dest" --- .gitignore | 1 + Makefile.am | 28 +++++++++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 96642fb..1990041 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ debian depcomp install-sh missing +ngircd.dest .deps *.a *.o diff --git a/Makefile.am b/Makefile.am index e1d8d60..58f202c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) +# Copyright (c)2001-2011 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 @@ -37,6 +37,10 @@ have-xcodebuild: >/dev/null 2>&1 \ || ( echo; echo "Error: \"xcodebuild\" not found!"; echo; exit 1 ) +have-packagemaker: + @packagemaker >/dev/null 2>&1; [ $$? -le 1 ] \ + || ( echo; echo "Error: \"packagemaker\" not found!"; echo; exit 2) + xcode: have-xcodebuild rel=`git describe|sed -e 's/rel-//g'|sed -e 's/-/~/'`; \ def="GCC_PREPROCESSOR_DEFINITIONS=\"VERSION=\\\"$$rel\\\"\""; \ @@ -55,10 +59,15 @@ deb: [ -f debian/rules ] || ln -s contrib/Debian debian dpkg-buildpackage -rfakeroot -i -osxpkg: have-xcodebuild - @packagemaker >/dev/null 2>&1; [ $$? -le 1 ] \ - || ( echo; echo "Error: \"packagemaker\" not found!"; echo; exit 2) - make clean +osxpkg: have-packagemaker osxpkg-dest + cd contrib/MacOSX && packagemaker \ + --doc ngIRCd.pmdoc \ + --out ../../$(distdir).mpkg + rm -f $(distdir).mpkg.zip + zip -ro9 $(distdir).mpkg.zip $(distdir).mpkg + rm -rf ngircd.dest $(distdir).mpkg + +osxpkg-dest: have-xcodebuild clean ./configure --prefix=/opt/ngircd make xcode make -C contrib/MacOSX de.barton.ngircd.plist @@ -71,11 +80,8 @@ osxpkg: have-xcodebuild rm ngircd.dest/opt/ngircd/etc/ngircd.conf echo "Have a nice day IRCing!" >ngircd.dest/opt/ngircd/etc/ngircd.motd chmod -R a-s,og-w,a+rX ngircd.dest - cd contrib/MacOSX && packagemaker \ - --doc ngIRCd.pmdoc \ - --out ../../$(distdir).mpkg - rm -f $(distdir).mpkg.zip - zip -ro9 $(distdir).mpkg.zip $(distdir).mpkg - rm -rf ngircd.dest $(distdir).mpkg + +.PHONY: deb have-packagemaker have-xcodebuild lint osxpkg osxpkg-dest rpm \ + srcdoc testsuite xcode xcode-clean # -eof-

1 0

Florian Westphal : fix clang warning about dead stores
by fw＠arthur.barton.de 12 Mai '11

12 Mai '11

Module: ngircd.git Branch: master Commit: 605b6a67bc7f41432d25ab646c232e347fd7a33f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=605b6a67… Author: Florian Westphal <fw(a)strlen.de> Date: Fri May 6 20:31:56 2011 +0200 fix clang warning about dead stores clang 'scan-build': Value stored to 'r' is never read Value stored to 'fd' is never read --- src/ngircd/irc-channel.c | 2 ++ src/ngircd/ngircd.c | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 476c313..66b3eeb 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -526,6 +526,8 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) Client_ID(Client), Channel_Name(chan), topic); #ifndef STRICT_RFC + if (!r) + return r; r = IRC_WriteStrClient(from, RPL_TOPICSETBY_MSG, Client_ID(Client), Channel_Name(chan), diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 4cac909..58383cf 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -706,10 +706,8 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) /* Detach stdin, stdout and stderr */ Setup_FDStreams(fd); - if (fd > 2) { + if (fd > 2) close(fd); - fd = -1; - } } pid = getpid();

1 0

Alexander Barton : contrib/platformtest.sh: fix gcc version detection
by alex＠arthur.barton.de 30 Apr '11

30 Apr '11

Module: ngircd.git Branch: master Commit: 10c7a156876f75ab5e21385d2775143dceefe2e9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=10c7a156… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 29 22:45:55 2011 +0200 contrib/platformtest.sh: fix gcc version detection Now the version of GNU C is detected correctly on SuSE Linux, too ... --- contrib/platformtest.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh index 85d3a1d..6449a67 100755 --- a/contrib/platformtest.sh +++ b/contrib/platformtest.sh @@ -96,8 +96,8 @@ if [ -r "Makefile" ]; then CC=$(grep "^CC = " Makefile | cut -d' ' -f3) $CC --version 2>&1 | grep -i "GCC" >/dev/null if [ $? -eq 0 ]; then - COMPILER=$($CC --version | head -1 | awk "{ print \$3 }" \ - | cut -d'-' -f1) + COMPILER=$($CC --version | head -1 \ + | cut -d')' -f2 | cut -d' ' -f2) COMPILER="gcc $COMPILER" else case "$CC" in

1 0

Florian Westphal : conn: avoid needlesly scary 'buffer overflow' messages
by fw＠arthur.barton.de 30 Apr '11

30 Apr '11

Module: ngircd.git Branch: master Commit: 0bb892bb5fe1f0d9d783808d211c039e11e12f3b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0bb892bb… Author: Florian Westphal <fw(a)strlen.de> Date: Fri Apr 29 23:10:01 2011 +0200 conn: avoid needlesly scary 'buffer overflow' messages When the write buffer space grows too large, ngircd has to disconnect the client to avoid wasting too much memory. ngircd logs this with a scary 'write buffer overflow' message. Change this to a more descriptive wording. --- src/ngircd/conn-zip.c | 6 +++--- src/ngircd/conn.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ngircd/conn-zip.c b/src/ngircd/conn-zip.c index fa3a11e..0a3c17c 100644 --- a/src/ngircd/conn-zip.c +++ b/src/ngircd/conn-zip.c @@ -108,8 +108,8 @@ Zip_Buffer( CONN_ID Idx, const char *Data, size_t Len ) * otherwise the zip wbuf would grow too large */ buflen = array_bytes(&My_Connections[Idx].zip.wbuf); if (buflen + Len >= WRITEBUFFER_SLINK_LEN) { - Log(LOG_ALERT, "Zip Write Buffer overflow: %lu bytes\n", buflen + Len); - Conn_Close(Idx, "Zip Write buffer overflow", NULL, false); + Log(LOG_ALERT, "Zip Write buffer space exhausted: %lu bytes", buflen + Len); + Conn_Close(Idx, "Zip Write buffer space exhausted", NULL, false); return false; } return array_catb(&My_Connections[Idx].zip.wbuf, Data, Len); @@ -158,7 +158,7 @@ Zip_Flush( CONN_ID Idx ) if (out->avail_out <= 0) { /* Not all data was compressed, because data became * bigger while compressing it. */ - Log (LOG_ALERT, "Compression error: buffer overvlow!?"); + Log(LOG_ALERT, "Compression error: buffer overflow!?"); Conn_Close(Idx, "Compression error!", NULL, false); return false; } diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index cc4364c..26e47c1 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -972,10 +972,10 @@ Conn_Write( CONN_ID Idx, char *Data, size_t Len ) if (array_bytes(&My_Connections[Idx].wbuf) + Len >= writebuf_limit) { Log(LOG_NOTICE, - "Write buffer overflow (connection %d, limit is %lu bytes, %lu bytes new, %lu bytes pending)!", + "Write buffer space exhausted (connection %d, limit is %lu bytes, %lu bytes new, %lu bytes pending)", Idx, writebuf_limit, Len, (unsigned long)array_bytes(&My_Connections[Idx].wbuf)); - Conn_Close(Idx, "Write buffer overflow!", NULL, false); + Conn_Close(Idx, "Write buffer space exhausted", NULL, false); return false; } @@ -1525,9 +1525,9 @@ Read_Request( CONN_ID Idx ) { /* Read buffer is full */ Log(LOG_ERR, - "Receive buffer overflow (connection %d): %d bytes!", + "Receive buffer space exhausted (connection %d): %d bytes", Idx, array_bytes(&My_Connections[Idx].rbuf)); - Conn_Close( Idx, "Receive buffer overflow!", NULL, false ); + Conn_Close(Idx, "Receive buffer space exhausted", NULL, false); return; } @@ -1563,7 +1563,7 @@ Read_Request( CONN_ID Idx ) Log(LOG_ERR, "Could not append recieved data to zip input buffer (connn %d): %d bytes!", Idx, len); - Conn_Close(Idx, "Receive buffer overflow!", NULL, + Conn_Close(Idx, "Receive buffer space exhausted", NULL, false); return; } @@ -1572,7 +1572,7 @@ Read_Request( CONN_ID Idx ) { if (!array_catb( &My_Connections[Idx].rbuf, readbuf, len)) { Log( LOG_ERR, "Could not append recieved data to input buffer (connn %d): %d bytes!", Idx, len ); - Conn_Close( Idx, "Receive buffer overflow!", NULL, false ); + Conn_Close(Idx, "Receive buffer space exhausted", NULL, false ); } }

1 0

Florian Westphal : parse: fix logical expression testing for non RFC1459 links
by fw＠arthur.barton.de 30 Apr '11

30 Apr '11

Module: ngircd.git Branch: master Commit: 05748aa5eeaf75438a0bb238967667605fe4d52e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=05748aa5… Author: Florian Westphal <fw(a)strlen.de> Date: Fri Apr 29 23:15:05 2011 +0200 parse: fix logical expression testing for non RFC1459 links parse.c:284: warning: suggest parentheses around operand of '!' or change '&' to '&&' or '!' to '~' The expression looks dubious, this should probably be an if-not-set, then... test. --- src/ngircd/parse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index d7dbffc..c260391 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -280,7 +280,7 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed ) assert( client != NULL ); if (!Req->prefix && Client_Type(client) == CLIENT_SERVER - && !Conn_Options(Idx) & CONN_RFC1459 + && !(Conn_Options(Idx) & CONN_RFC1459) && strcasecmp(Req->command, "ERROR") != 0 && strcasecmp(Req->command, "PING") != 0) {

1 0

Alexander Barton : Only require server prefixes on non RFC1459 links
by alex＠arthur.barton.de 29 Apr '11

29 Apr '11

Module: ngircd.git Branch: master Commit: c26ca7773bfc92ca41344a0994bee45ec917b261 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c26ca777… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 29 12:11:01 2011 +0200 Only require server prefixes on non RFC1459 links Not all servers (and services!) using the RFC1459 protocol style send prefixes on all commands; so don't require them to do so. This relaxes the requirements introduced by commit 15775e679. --- src/ngircd/parse.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 8f5e601..d7dbffc 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -280,6 +280,7 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed ) assert( client != NULL ); if (!Req->prefix && Client_Type(client) == CLIENT_SERVER + && !Conn_Options(Idx) & CONN_RFC1459 && strcasecmp(Req->command, "ERROR") != 0 && strcasecmp(Req->command, "PING") != 0) {

1 0

Alexander Barton : Merge branch 'master' of git://arthur.barton.de/ ngircd-alex
by alex＠arthur.barton.de 26 Apr '11

26 Apr '11

Module: ngircd.git Branch: master Commit: 1cb2f5739d867502c45cad1c8edfa4c5dcd47933 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1cb2f573… Author: Alexander Barton <alex(a)barton.de> Date: Tue Apr 26 12:04:22 2011 +0200 Merge branch 'master' of git://arthur.barton.de/ngircd-alex * 'master' of git://arthur.barton.de/ngircd-alex: Do reverse lookups using the AF of the incoming connection resolve: fix reverse lookups of client connections with ConnectIPv6=no ---

1 0