April 2010 - ngIRCd GIT Updates

Alexander Barton : Include netinet/in_systm.h alongside netinet/ip.h
by alex＠arthur.barton.de 11 Apr '10

11 Apr '10

Module: ngircd.git Branch: master Commit: 1caa3fb94b6e23d7b63183f6cb6c97ed1821350c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1caa3fb9… Author: Alexander Barton <alex(a)barton.de> Date: Sun Apr 11 16:58:29 2010 +0000 Include netinet/in_systm.h alongside netinet/ip.h This fixes the following error when compiling on e.g. FreeBSD 6.x: In file included from conn.c:40: /usr/include/netinet/ip.h:160: error: syntax error before "n_long" /usr/include/netinet/ip.h:163: error: syntax error before "n_long" --- src/ngircd/conn.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index ab975b3..0ff6067 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -37,6 +37,7 @@ #include <netinet/in.h> #ifdef HAVE_NETINET_IP_H +# include <netinet/in_systm.h> # include <netinet/ip.h> #endif

1 0

Alexander Barton : Fix gcc warning "ignoring return value of ..."
by alex＠arthur.barton.de 09 Apr '10

09 Apr '10

Module: ngircd.git Branch: master Commit: 025342fe46ae504a08be8c642901ec7eb7c4fccb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=025342fe… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 9 20:08:47 2010 +0200 Fix gcc warning "ignoring return value of ..." This patch fixes two warnings of gcc 4.4.3 when used with eglibc 2.11.1: ngircd.c: In function ‘NGIRCd_Init’: ngircd.c:801: warning: ignoring return value of ‘chdir’, declared with attribute warn_unused_result conn.c: In function ‘Simple_Message’: conn.c:2041: warning: ignoring return value of ‘write’, declared with attribute warn_unused_result The first by checking the return code and an appropriate error message, the second by "better" ignoring it (which is correct there!) ... --- src/ngircd/conn.c | 32 ++++++++++++++++++++++---------- src/ngircd/ngircd.c | 4 +++- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index cd350a8..ab975b3 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -2025,20 +2025,32 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) } /* cb_Read_Resolver_Result */ +/** + * Write a "simple" (error) message to a socket. + * The message is sent without using the connection write buffers, without + * compression/encryption, and even without any error reporting. It is + * designed for error messages of e.g. New_Connection(). */ static void -Simple_Message( int Sock, const char *Msg ) +Simple_Message(int Sock, const char *Msg) { char buf[COMMAND_LEN]; size_t len; - /* Write "simple" message to socket, without using compression - * or even the connection write buffers. Used e.g. for error - * messages by New_Connection(). */ - assert( Sock > NONE ); - assert( Msg != NULL ); - - strlcpy( buf, Msg, sizeof buf - 2); - len = strlcat( buf, "\r\n", sizeof buf); - (void)write(Sock, buf, len); + + assert(Sock > NONE); + assert(Msg != NULL); + + strlcpy(buf, Msg, sizeof buf - 2); + len = strlcat(buf, "\r\n", sizeof buf); + if (write(Sock, buf, len) < 0) { + /* Because this function most probably got called to log + * an error message, any write error is ignored here to + * avoid an endless loop. But casting the result of write() + * to "void" doesn't satisfy the GNU C code attribute + * "warn_unused_result" which is used by some versions of + * glibc (e.g. 2.11.1), therefore this silly error + * "handling" code here :-( */ + return; + } } /* Simple_Error */ diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 82ba67c..b951bad 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -798,7 +798,9 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) #else setpgrp(0, getpid()); #endif - chdir( "/" ); + if (chdir( "/" ) != 0) + Log(LOG_ERR, "Can't change directory to '/': %s", + strerror(errno)); /* Detach stdin, stdout and stderr */ Setup_FDStreams( );

1 0

Alexander Barton : Only compile in Get_Error() if really needed
by alex＠arthur.barton.de 09 Apr '10

09 Apr '10

Module: ngircd.git Branch: master Commit: 628c6c962b1054de4c27304f53c4ac7c50c79a11 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=628c6c96… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 9 20:06:44 2010 +0200 Only compile in Get_Error() if really needed This fixes "resolve.c:150: warning: ‘Get_Error’ defined but not used". --- src/ngircd/resolve.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index 37d1c51..bccf518 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -144,8 +144,8 @@ Resolve_Init(RES_STAT *s) } -#ifndef WANT_IPV6 -#ifdef h_errno +#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO) +#if !defined(WANT_IPV6) && defined(h_errno) static char * Get_Error( int H_Error ) { @@ -162,8 +162,8 @@ Get_Error( int H_Error ) } return "unknown error"; } -#endif /* h_errno */ -#endif /* WANT_IPV6 */ +#endif +#endif /* Do "IDENT" (aka "AUTH") lookup and append result to resolved_addr array */

1 0

Alexander Barton : Updated some more copyright notices, it's 2010 already ( part 2)
by alex＠arthur.barton.de 02 Apr '10

02 Apr '10

Module: ngircd.git Branch: master Commit: 1ed49de83a335713ee437171335c93725dd19ee6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1ed49de8… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 2 14:22:07 2010 +0200 Updated some more copyright notices, it's 2010 already (part 2) Silly me forgot the most important place, the program output itself ... --- src/ngircd/ngircd.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 5fc88c9..82ba67c 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.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 @@ -562,7 +562,7 @@ static void Show_Version( void ) { puts( NGIRCd_Version ); - puts( "Copyright (c)2001-2009 Alexander Barton (<alex(a)barton.de>) and Contributors." ); + puts( "Copyright (c)2001-2010 Alexander Barton (<alex(a)barton.de>) and Contributors." ); puts( "Homepage: <http://ngircd.barton.de/>\n" ); puts( "This is free software; see the source for copying conditions. There is NO" ); puts( "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." );

1 0

Alexander Barton : Updated some more copyright notices, it's 2010 already : -)
by alex＠arthur.barton.de 02 Apr '10

02 Apr '10

Module: ngircd.git Branch: master Commit: bb914b93e9cd2a2e92d75e1d611f1541365e2e76 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bb914b93… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 2 14:19:36 2010 +0200 Updated some more copyright notices, it's 2010 already :-) --- ChangeLog | 2 +- contrib/MacOSX/ngIRCd.pmdoc/index.xml | 4 ++-- doc/Platforms.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 878eb25..c7b1303 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ ngIRCd - Next Generation IRC Server - (c)2001-2009 Alexander Barton, + (c)2001-2010 Alexander Barton, alex(a)barton.de, http://www.barton.de/ ngIRCd is free software and published under the diff --git a/contrib/MacOSX/ngIRCd.pmdoc/index.xml b/contrib/MacOSX/ngIRCd.pmdoc/index.xml index 2881d58..5d6b8e3 100644 --- a/contrib/MacOSX/ngIRCd.pmdoc/index.xml +++ b/contrib/MacOSX/ngIRCd.pmdoc/index.xml @@ -4,7 +4,7 @@ \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural \f0\i\fs24 \cf0 ngIRCd -- The Next Generation IRC Daemon\ -Copyright (c)2001-2009 Alexander Barton and Contributors.\ +Copyright (c)2001-2010 Alexander Barton and Contributors.\ \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural \i0 \cf0 \ @@ -187,4 +187,4 @@ To disable automatic starting of ngIRCd, use this command:\ \ls2\ilvl0 \f1\fs24 \cf0 sudo launchctl unload -w \\\ /Library/LaunchDaemons/de.barton.ngircd.plist\ -}]]></resource></locale></resources><flags/><item type="file">01ngircd.xml</item><item type="file">02de.xml</item><mod>properties.customizeOption</mod><mod>properties.title</mod><mod>description</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc> \ No newline at end of file +}]]></resource></locale></resources><flags/><item type="file">01ngircd.xml</item><item type="file">02de.xml</item><mod>properties.customizeOption</mod><mod>properties.title</mod><mod>description</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc> diff --git a/doc/Platforms.txt b/doc/Platforms.txt index 8629252..f1f3658 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -1,7 +1,7 @@ ngIRCd - Next Generation IRC Server - (c)2001-2009 Alexander Barton + (c)2001-2010 Alexander Barton alex(a)barton.de, http://www.barton.de/ ngIRCd is free software and published under the

1 0