ngIRCd 0.7.0-pre2

failures occured. [from HEAD].

ChangeLog

@@ -10,8 +10,20 @@
                                -- ChangeLog --
 
 
-ngIRCd CVS-HEAD
+ngIRCd 0.7.0
 
+  ngIRCd 0.7.0-pre2 (2003-04-27)
+  - CVS build system fixes (made autogen.sh more portable).
+  - Fixed compilation and test-suite on Solaris (tested with 2.6).
+  - New documentation file "doc/Platforms.txt" describing the status of
+    ngIRCd on the various tested platforms.
+  - Test for broken GCC on Mac OS X and disable "-pedantic" in this case.
+  - Disable "-ansi" on Cygwin: system headers are incompatible.
+  - The server tried to connect to other servers only once when DNS or
+    socket failures occured.
+  - Fixed --configtest: There is no variable "ServerPwd", it's "Password".
+
+  ngIRCd 0.7.0-pre1 (2003-04-22)
   - New signal handler (more secure, actions are executed outside).
   - GCC: the compiler is now called with more warning options enabled.
   - Replaced a lot of str[n]cpy(), str[n]cat() and sprintf() calls with the
@@ -433,4 +445,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: ChangeLog,v 1.188 2003/04/20 23:12:57 alex Exp $
+$Id: ChangeLog,v 1.188.2.10 2003/04/27 18:33:26 alex Exp $

INSTALL

@@ -93,6 +93,7 @@ This files will be installed by default:
 
 - /usr/local/sbin/ngircd: executable server
 - /usr/local/etc/ngircd.conf: sample configuration (if not already present)
+- /usr/local/share/doc/ngircd/: documentation
 
 
 II. Useful make-targets
@@ -157,4 +158,4 @@ number. In both cases the server exits after the output.
 
 
 -- 
-$Id: INSTALL,v 1.15 2003/03/23 23:13:15 alex Exp $
+$Id: INSTALL,v 1.15.2.1 2003/04/22 20:00:32 alex Exp $

NEWS

@@ -10,7 +10,7 @@
                                   -- NEWS --
 
 
-ngIRCd CVS-HEAD
+ngIRCd 0.7.0
 
   - New command CONNECT to enable and add server links. The syntax is not
     RFC-compatible: use "CONNECT <name> <port>" to enable and connect an
@@ -161,4 +161,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: NEWS,v 1.53 2003/04/20 23:14:28 alex Exp $
+$Id: NEWS,v 1.53.2.2 2003/04/27 18:33:26 alex Exp $

autogen.sh

@@ -1,9 +1,10 @@
 #!/bin/sh
 #
-# $Id: autogen.sh,v 1.6 2003/04/13 22:34:17 alex Exp $
+# $Id: autogen.sh,v 1.6.2.1 2003/04/22 10:18:41 alex Exp $
 #
 
-export WANT_AUTOMAKE=1.6
+WANT_AUTOMAKE=1.6
+export WANT_AUTOMAKE
 
 aclocal && \
  autoheader && \

configure.in

@@ -8,13 +8,13 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: configure.in,v 1.89 2003/04/21 10:51:44 alex Exp $
+# $Id: configure.in,v 1.89.2.5 2003/04/27 18:33:26 alex Exp $
 #
 
 # -- Initialisierung --
 
 AC_PREREQ(2.50)
-AC_INIT(ngircd, CVSHEAD)
+AC_INIT(ngircd, 0.7.0-pre2)
 AC_CONFIG_SRCDIR(src/ngircd/ngircd.c)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(1.6)
@@ -76,6 +76,13 @@ if test `uname` = "HP-UX"; then
 	add_DEFINES="-D_XOPEN_SOURCE_EXTENDED $add_DEFINES"
 fi
 
+if test `uname` = "SunOS"; then
+	# define _XOPEN_SOURCE, _XOPEN_SOURCE_EXTENDED=1 and __EXTENSIONS__
+	# when compiling on SunOS (tested with 5.6):
+	AC_MSG_RESULT([detected SunOS, defining _XOPEN_SOURCE, _XOPEN_SOURCE_EXTENDED=1 and __EXTENSIONS__])
+	add_DEFINES="-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__ $add_DEFINES"
+fi
+
 # -- Header --
 
 AC_HEADER_STDC
@@ -259,7 +266,26 @@ AC_DEFINE_UNQUOTED(TARGET_OS, "$target_os" )
 
 if test "$GCC" = "yes"; then
 	the_CFLAGS="-Wmissing-declarations -Wpointer-arith -Wstrict-prototypes"
-	add_CFLAGS="-Wall -W -ansi -pedantic $CFLAGS $CFLAGS_ADD"
+	ansi=" -ansi"
+	pedantic=" -pedantic"
+
+	$CC --version | grep 20020420 > /dev/null 2>&1
+	if test $? -eq 0; then
+		# Mac OS X (and Darwin?) ship with a slightly broken
+		# prerelease of GCC 3.1 which don't like -pedantic:
+		AC_MSG_RESULT([detected broken GNU C compiler, disabling "-pedantic"])
+		pedantic=""
+	fi
+
+	uname | grep "CYGWIN" > /dev/null 2>&1
+	if test $? -eq 0; then
+		# The include files of Cygwin don't like -ansi,
+		# so we disable it:
+		AC_MSG_RESULT([detected Cygwin, disabling "-ansi"])
+		ansi=""
+	fi
+
+	add_CFLAGS="-Wall -W${ansi}${pedantic} $CFLAGS $CFLAGS_ADD"
 else
 	the_CFLAGS="$CFLAGS"
 	add_CFLAGS="$CFLAGS_ADD"

contrib/ngircd.spec

@@ -1,5 +1,5 @@
 %define name    ngircd
-%define version CurrentCVS
+%define version 0.7.0-pre2
 %define release 1
 %define prefix  %{_prefix}
 

doc/Makefile.am

@@ -9,11 +9,11 @@
 # Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
 # der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
 #
-# $Id: Makefile.am,v 1.16 2003/04/21 08:01:29 alex Exp $
+# $Id: Makefile.am,v 1.16.2.1 2003/04/22 23:52:48 alex Exp $
 #
 
-EXTRA_DIST = CVS.txt FAQ.txt Protocol.txt README-AUX.txt \
-	README-BeOS.txt RFC.txt sample-ngircd.conf
+EXTRA_DIST = CVS.txt FAQ.txt Protocol.txt Platforms.txt \
+	README-AUX.txt README-BeOS.txt RFC.txt sample-ngircd.conf
 
 maintainer-clean-local:
 	rm -f Makefile Makefile.in

doc/Platforms.txt

@@ -0,0 +1,52 @@
+
+                     ngIRCd - Next Generation IRC Server
+
+                      (c)2001-2003 by Alexander Barton,
+                    alex@barton.de, http://www.barton.de/
+
+               ngIRCd is free software and published under the
+                   terms of the GNU General Public License.
+
+                              -- Platforms.txt --
+
+
+This file lists the status of all platforms on which the ngIRCd has been
+tested. Included is the date and version of the last "official" test and
+the name of the tester/maintainer.
+
+If you successfully compiled and tested ngIRCd on a platform that isn't
+listed here, please contact Alexander Barton, <alex@barton.de>, so that this
+list can be updated. Thanks for your help!
+
+
+                              the executable works ("runs") as expected --+
+                                tests run successfully ("make check") --+ |
+                                           ngIRCd compiles ("make") --+ | |
+                                                ./configure works --+ | | |
+                                                                    | | | |
+Platform                    Compiler     ngIRCd     Date     Tester C M T R See
+--------------------------- ------------ ---------- -------- ------ - - - - ---
+i386/unknown/freebsd5.0     gcc 3.2.1    0.7.x-CVS  03-04-23 alex   Y Y Y Y
+i386/unknown/netbsdelf1.6.1 gcc 2.95.3   0.7.x-CVS  03-04-23 alex   Y Y Y Y
+i686/pc/cygwin              gcc 3.2      0.7.x-CVS  03-04-24 alex   Y Y n Y
+i686/pc/linux-gnu           gcc 2.95/3.x 0.7.0-pre1 03-04-22 alex   Y Y Y Y (1)
+m68k/apple/aux3.1.1         Orig. A/UX   0.7.x-CVS  03-04-22 alex   Y Y Y Y (2)
+powerpc/apple/darwin6.5     gcc 3.1      0.7.x-CVS  03-04-23 alex   Y Y Y Y
+sparc/sun/solaris2.6        gcc 2.95.3   0.7.x-CVS  03-04-22 alex   Y Y Y Y
+
+
+Notes
+~~~~~
+(1) i686/pc/linux-gnu:
+    ngIRCd has been tested with various Linux distributions, such as SuSE,
+    RedHat, Debian, and Gentoo using Kernels 2.2.x or 2.4.x and various
+    versions of the GNU C compiler (2.95.3, 3.0, 3.2 and 3.3). The eldest
+    glibc used was glibc-2.0.7. ngIRCd compiled and run on all these systems
+    without problems.
+
+(2) This compiler is an pre-ANSI C compiler, therefore the source code is
+    automatically converted using the included ansi2knr tool while building.
+			
+
+-- 
+$Id: Platforms.txt,v 1.1.2.3 2003/04/23 23:32:24 alex Exp $

doc/sample-ngircd.conf

@@ -1,4 +1,4 @@
-# $Id: sample-ngircd.conf,v 1.20 2003/03/10 00:23:34 alex Exp $
+# $Id: sample-ngircd.conf,v 1.20.2.1 2003/04/27 11:50:32 alex Exp $
 
 #
 # This is a sample configuration file for the ngIRCd, which must adept to
@@ -23,6 +23,9 @@
 	# LINKS requests for example.
 	Info = Server Info Text
 	
+	# Global password for all users needed to connect to the server
+	;Password = abc
+	
 	# Information about the server and the administrator, used by the
 	# ADMIN command.
 	;AdminInfo1 = Description

src/ngircd/conf.c

@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conf.c,v 1.57 2003/04/21 11:06:07 alex Exp $";
+static char UNUSED id[] = "$Id: conf.c,v 1.57.2.1 2003/04/27 11:48:53 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -108,7 +108,7 @@ Conf_Test( VOID )
 	puts( "[GLOBAL]" );
 	printf( "  ServerName = %s\n", Conf_ServerName );
 	printf( "  ServerInfo = %s\n", Conf_ServerInfo );
-	printf( "  ServerPwd = %s\n", Conf_ServerPwd );
+	printf( "  Password = %s\n", Conf_ServerPwd );
 	printf( "  AdminInfo1 = %s\n", Conf_ServerAdmin1 );
 	printf( "  AdminInfo2 = %s\n", Conf_ServerAdmin2 );
 	printf( "  AdminEMail = %s\n", Conf_ServerAdminMail );

src/ngircd/conn.c

@@ -16,7 +16,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conn.c,v 1.122 2003/04/21 10:52:26 alex Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.122.2.1 2003/04/25 16:50:53 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -1348,7 +1348,7 @@ Check_Servers( VOID )
 LOCAL VOID
 New_Server( INT Server, CONN_ID Idx )
 {
-	/* Neue Server-Verbindung aufbauen */
+	/* Establish new server link */
 
 	struct sockaddr_in new_addr;
 	struct in_addr inaddr;
@@ -1358,11 +1358,12 @@ New_Server( INT Server, CONN_ID Idx )
 	assert( Server > NONE );
 	assert( Idx > NONE );
 
-	/* Wurde eine gueltige IP-Adresse gefunden? */
+	/* Did we get a valid IP address? */
 	if( ! Conf_Server[Server].ip[0] )
 	{
-		/* Nein. Verbindung wieder freigeben: */
+		/* No. Free connection structure and abort: */
 		Init_Conn_Struct( Idx );
+		Conf_Server[Server].conn_id = NONE;
 		Log( LOG_ERR, "Can't connect to \"%s\" (connection %d): ip address unknown!", Conf_Server[Server].host, Idx );
 		return;
 	}
@@ -1377,8 +1378,9 @@ New_Server( INT Server, CONN_ID Idx )
 	if( inaddr.s_addr == (unsigned)-1 )
 #endif
 	{
-		/* Konnte Adresse nicht konvertieren */
+		/* Can't convert IP address */
 		Init_Conn_Struct( Idx );
+		Conf_Server[Server].conn_id = NONE;
 		Log( LOG_ERR, "Can't connect to \"%s\" (connection %d): can't convert ip address %s!", Conf_Server[Server].host, Idx, Conf_Server[Server].ip );
 		return;
 	}
@@ -1391,7 +1393,9 @@ New_Server( INT Server, CONN_ID Idx )
 	new_sock = socket( PF_INET, SOCK_STREAM, 0 );
 	if ( new_sock < 0 )
 	{
+		/* Can't create socket */
 		Init_Conn_Struct( Idx );
+		Conf_Server[Server].conn_id = NONE;
 		Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
 		return;
 	}
@@ -1401,9 +1405,11 @@ New_Server( INT Server, CONN_ID Idx )
 	res = connect( new_sock, (struct sockaddr *)&new_addr, sizeof( new_addr ));
 	if(( res != 0 ) && ( errno != EINPROGRESS ))
 	{
+		/* Can't connect socket */
 		Log( LOG_CRIT, "Can't connect socket: %s!", strerror( errno ));
 		close( new_sock );
 		Init_Conn_Struct( Idx );
+		Conf_Server[Server].conn_id = NONE;
 		return;
 	}
 
@@ -1411,20 +1417,22 @@ New_Server( INT Server, CONN_ID Idx )
 	c = Client_NewLocal( Idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWNSERVER, FALSE );
 	if( ! c )
 	{
+		/* Can't create new client structure */
 		close( new_sock );
 		Init_Conn_Struct( Idx );
+		Conf_Server[Server].conn_id = NONE;
 		Log( LOG_ALERT, "Can't establish connection: can't create client structure!" );
 		return;
 	}
 	Client_SetIntroducer( c, c );
 	Client_SetToken( c, TOKEN_OUTBOUND );
 
-	/* Verbindung registrieren */
+	/* Register connection */
 	My_Connections[Idx].sock = new_sock;
 	My_Connections[Idx].addr = new_addr;
 	strlcpy( My_Connections[Idx].host, Conf_Server[Server].host, sizeof( My_Connections[Idx].host ));
 
-	/* Neuen Socket registrieren */
+	/* Register new socket */
 	FD_SET( new_sock, &My_Sockets );
 	FD_SET( new_sock, &My_Connects );
 	if( new_sock > Conn_MaxFD ) Conn_MaxFD = new_sock;

src/testsuite/getpid.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 # ngIRCd Test Suite
-# $Id: getpid.sh,v 1.2 2002/11/10 14:28:06 alex Exp $
+# $Id: getpid.sh,v 1.2.4.1 2003/04/22 20:01:23 alex Exp $
 
 # wurde ein Name uebergeben?
 [ $# -ne 1 ] && exit 1
@@ -18,7 +18,9 @@ fi
 
 # PID ermitteln
 ps $PS_FLAGS > procs.tmp
-pid=$( cat procs.tmp | grep "$1" | awk "{print \$$PS_PIDCOL}" | sort -n | head $HEAD_FLAGS )
+cat procs.tmp | grep "$1" | awk "{print \$$PS_PIDCOL}" | sort -n > pids.tmp
+pid=`head $HEAD_FLAGS pids.tmp`
+rm -rf procs.tmp pids.tmp
 
 # ermittelte PID validieren
 [ "$pid" -gt 1 ] > /dev/null 2>&1

src/testsuite/stress-server.sh

@@ -1,10 +1,10 @@
 #!/bin/sh
 # ngIRCd Test Suite
-# $Id: stress-server.sh,v 1.6 2002/09/23 22:07:43 alex Exp $
+# $Id: stress-server.sh,v 1.6.4.1 2003/04/22 20:01:23 alex Exp $
 
 [ -z "$srcdir" ] && srcdir=`dirname $0`
 
-[ $1 -gt 0 ] 2> /dev/null && CLIENTS=$1 || CLIENTS=5
+[ "$1" -gt 0 ] 2> /dev/null && CLIENTS="$1" || CLIENTS=5
 
 name=`basename $0`
 test=`echo ${name} | cut -d '.' -f 1`