X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconn.c;h=137d4c70e5152c0e4382aa0f7682affbe43a6023;hp=e3f88011b178731f8a2e4c70ab2d82e4dfd09622;hb=8adff5922376676c2eeb49de1cbab86cc345b887;hpb=29bd35bc4fa858f0ed36e39a3d00830859ce22c8

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index e3f88011..137d4c70 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2004 Alexander Barton <alex@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
@@ -16,11 +16,15 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conn.c,v 1.117 2003/02/23 12:04:05 alex Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.144 2005/03/19 18:43:48 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
-#include <stdarg.h>
+#ifdef PROTOTYPES
+#	include <stdarg.h>
+#else
+#	include <varargs.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -33,14 +37,22 @@ static char UNUSED id[] = "$Id: conn.c,v 1.117 2003/02/23 12:04:05 alex Exp $";
 #include <time.h>
 #include <netinet/in.h>
 
+#ifdef HAVE_NETINET_IP_H
+# include <netinet/ip.h>
+#endif
+
 #ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
+# include <arpa/inet.h>
 #else
-#define PF_INET AF_INET
+# define PF_INET AF_INET
 #endif
 
 #ifdef HAVE_STDINT_H
-#include <stdint.h>			/* u.a. fuer Mac OS X */
+# include <stdint.h>			/* e.g. for Mac OS X */
+#endif
+
+#ifdef TCPWRAP
+# include <tcpd.h>			/* for TCP Wrappers */
 #endif
 
 #include "defines.h"
@@ -60,7 +72,7 @@ static char UNUSED id[] = "$Id: conn.c,v 1.117 2003/02/23 12:04:05 alex Exp $";
 #include "tool.h"
 
 #ifdef RENDEZVOUS
-#include "rendezvous.h"
+# include "rendezvous.h"
 #endif
 
 #include "exp.h"
@@ -69,27 +81,34 @@ static char UNUSED id[] = "$Id: conn.c,v 1.117 2003/02/23 12:04:05 alex Exp $";
 #define SERVER_WAIT (NONE - 1)
 
 
-LOCAL VOID Handle_Read PARAMS(( INT sock ));
-LOCAL BOOLEAN Handle_Write PARAMS(( CONN_ID Idx ));
-LOCAL VOID New_Connection PARAMS(( INT Sock ));
-LOCAL CONN_ID Socket2Index PARAMS(( INT Sock ));
-LOCAL VOID Read_Request PARAMS(( CONN_ID Idx ));
-LOCAL BOOLEAN Try_Write PARAMS(( CONN_ID Idx ));
-LOCAL BOOLEAN Handle_Buffer PARAMS(( CONN_ID Idx ));
-LOCAL VOID Check_Connections PARAMS(( VOID ));
-LOCAL VOID Check_Servers PARAMS(( VOID ));
-LOCAL VOID Init_Conn_Struct PARAMS(( CONN_ID Idx ));
-LOCAL BOOLEAN Init_Socket PARAMS(( INT Sock ));
-LOCAL VOID New_Server PARAMS(( INT Server, CONN_ID Idx ));
-LOCAL VOID Read_Resolver_Result PARAMS(( INT r_fd ));
+LOCAL void Handle_Read PARAMS(( int sock ));
+LOCAL bool Handle_Write PARAMS(( CONN_ID Idx ));
+LOCAL void New_Connection PARAMS(( int Sock ));
+LOCAL CONN_ID Socket2Index PARAMS(( int Sock ));
+LOCAL void Read_Request PARAMS(( CONN_ID Idx ));
+LOCAL bool Try_Write PARAMS(( CONN_ID Idx ));
+LOCAL bool Handle_Buffer PARAMS(( CONN_ID Idx ));
+LOCAL void Check_Connections PARAMS(( void ));
+LOCAL void Check_Servers PARAMS(( void ));
+LOCAL void Init_Conn_Struct PARAMS(( CONN_ID Idx ));
+LOCAL bool Init_Socket PARAMS(( int Sock ));
+LOCAL void New_Server PARAMS(( int Server, CONN_ID Idx ));
+LOCAL void Read_Resolver_Result PARAMS(( int r_fd ));
+LOCAL void Simple_Message PARAMS(( int Sock, char *Msg ));
+LOCAL int Count_Connections PARAMS(( struct sockaddr_in addr ));
 
 LOCAL fd_set My_Listeners;
 LOCAL fd_set My_Sockets;
 LOCAL fd_set My_Connects;
 
+#ifdef TCPWRAP
+int allow_severity = LOG_INFO;
+int deny_severity = LOG_ERR;
+#endif
+
 
-GLOBAL VOID
-Conn_Init( VOID )
+GLOBAL void
+Conn_Init( void )
 {
 	/* Modul initialisieren: statische Strukturen "ausnullen". */
 
@@ -102,14 +121,16 @@ Conn_Init( VOID )
 		/* konfiguriertes Limit beachten */
 		if( Pool_Size > Conf_MaxConnections ) Pool_Size = Conf_MaxConnections;
 	}
-	My_Connections = malloc( sizeof( CONNECTION ) * Pool_Size );
+	My_Connections = (CONNECTION *)malloc( sizeof( CONNECTION ) * Pool_Size );
 	if( ! My_Connections )
 	{
 		/* Speicher konnte nicht alloziert werden! */
 		Log( LOG_EMERG, "Can't allocate memory! [Conn_Init]" );
 		exit( 1 );
 	}
-	Log( LOG_DEBUG, "Allocted connection pool for %d items (%ld bytes).", Pool_Size, sizeof( CONNECTION ) * Pool_Size );
+#ifdef DEBUG
+	Log( LOG_DEBUG, "Allocated connection pool for %d items (%ld bytes).", Pool_Size, sizeof( CONNECTION ) * Pool_Size );
+#endif
 
 	/* zu Beginn haben wir keine Verbindungen */
 	FD_ZERO( &My_Listeners );
@@ -127,21 +148,23 @@ Conn_Init( VOID )
 } /* Conn_Init */
 
 
-GLOBAL VOID
-Conn_Exit( VOID )
+GLOBAL void
+Conn_Exit( void )
 {
 	/* Modul abmelden: alle noch offenen Connections
 	 * schliessen und freigeben. */
 
 	CONN_ID idx;
-	INT i;
+	int i;
 
+#ifdef DEBUG
 	Log( LOG_DEBUG, "Shutting down all connections ..." );
+#endif
 
 #ifdef RENDEZVOUS
 	Rendezvous_UnregisterListeners( );
 #endif
-	
+
 	/* Sockets schliessen */
 	for( i = 0; i < Conn_MaxFD + 1; i++ )
 	{
@@ -154,17 +177,21 @@ Conn_Exit( VOID )
 			if( FD_ISSET( i, &My_Listeners ))
 			{
 				close( i );
+#ifdef DEBUG
 				Log( LOG_DEBUG, "Listening socket %d closed.", i );
+#endif
 			}
 			else if( FD_ISSET( i, &My_Connects ))
 			{
 				close( i );
+#ifdef DEBUG
 				Log( LOG_DEBUG, "Connection %d closed during creation (socket %d).", idx, i );
+#endif
 			}
 			else if( idx < Pool_Size )
 			{
-				if( NGIRCd_SignalRestart ) Conn_Close( idx, NULL, "Server going down (restarting)", TRUE );
-				else Conn_Close( idx, NULL, "Server going down", TRUE );
+				if( NGIRCd_SignalRestart ) Conn_Close( idx, NULL, "Server going down (restarting)", true );
+				else Conn_Close( idx, NULL, "Server going down", true );
 			}
 			else
 			{
@@ -173,19 +200,19 @@ Conn_Exit( VOID )
 			}
 		}
 	}
-	
+
 	free( My_Connections );
 	My_Connections = NULL;
 	Pool_Size = 0;
 } /* Conn_Exit */
 
 
-GLOBAL INT
-Conn_InitListeners( VOID )
+GLOBAL int
+Conn_InitListeners( void )
 {
 	/* Initialize ports on which the server should accept connections */
 
-	INT created, i;
+	int created, i;
 
 	created = 0;
 	for( i = 0; i < Conf_ListenPorts_Count; i++ )
@@ -197,62 +224,80 @@ Conn_InitListeners( VOID )
 } /* Conn_InitListeners */
 
 
-GLOBAL VOID
-Conn_ExitListeners( VOID )
+GLOBAL void
+Conn_ExitListeners( void )
 {
 	/* Close down all listening sockets */
 
-	INT i;
+	int i;
 
 #ifdef RENDEZVOUS
 	Rendezvous_UnregisterListeners( );
 #endif
-	
+
 	Log( LOG_INFO, "Shutting down all listening sockets ..." );
 	for( i = 0; i < Conn_MaxFD + 1; i++ )
 	{
 		if( FD_ISSET( i, &My_Sockets ) && FD_ISSET( i, &My_Listeners ))
 		{
 			close( i );
+#ifdef DEBUG
 			Log( LOG_DEBUG, "Listening socket %d closed.", i );
+#endif
 		}
 	}
 } /* Conn_ExitListeners */
 
 
-GLOBAL BOOLEAN
-Conn_NewListener( CONST UINT Port )
+GLOBAL bool
+Conn_NewListener( const UINT16 Port )
 {
 	/* Create new listening socket on specified port */
 
 	struct sockaddr_in addr;
-	INT sock;
+	struct in_addr inaddr;
+	int sock;
 #ifdef RENDEZVOUS
-	CHAR name[CLIENT_ID_LEN], *info;
+	char name[CLIENT_ID_LEN], *info;
 #endif
-	
+
 	/* Server-"Listen"-Socket initialisieren */
 	memset( &addr, 0, sizeof( addr ));
+	memset( &inaddr, 0, sizeof( inaddr ));
 	addr.sin_family = AF_INET;
 	addr.sin_port = htons( Port );
-	addr.sin_addr.s_addr = htonl( INADDR_ANY );
+	if( Conf_ListenAddress[0] )
+	{
+#ifdef HAVE_INET_ATON
+		if( inet_aton( Conf_ListenAddress, &inaddr ) == 0 )
+#else
+		inaddr.s_addr = inet_addr( Conf_ListenAddress );
+		if( inaddr.s_addr == (unsigned)-1 )
+#endif
+		{
+			Log( LOG_CRIT, "Can't listen on %s:%u: can't convert ip address %s!", Conf_ListenAddress, Port, Conf_ListenAddress );
+			return false;
+		}
+	}
+	else inaddr.s_addr = htonl( INADDR_ANY );
+	addr.sin_addr = inaddr;
 
 	/* Socket erzeugen */
 	sock = socket( PF_INET, SOCK_STREAM, 0);
 	if( sock < 0 )
 	{
 		Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
-		return FALSE;
+		return false;
 	}
 
-	if( ! Init_Socket( sock )) return FALSE;
+	if( ! Init_Socket( sock )) return false;
 
 	/* an Port binden */
 	if( bind( sock, (struct sockaddr *)&addr, (socklen_t)sizeof( addr )) != 0 )
 	{
 		Log( LOG_CRIT, "Can't bind socket: %s!", strerror( errno ));
 		close( sock );
-		return FALSE;
+		return false;
 	}
 
 	/* in "listen mode" gehen :-) */
@@ -260,7 +305,7 @@ Conn_NewListener( CONST UINT Port )
 	{
 		Log( LOG_CRIT, "Can't listen on soecket: %s!", strerror( errno ));
 		close( sock );
-		return FALSE;
+		return false;
 	}
 
 	/* Neuen Listener in Strukturen einfuegen */
@@ -269,7 +314,8 @@ Conn_NewListener( CONST UINT Port )
 
 	if( sock > Conn_MaxFD ) Conn_MaxFD = sock;
 
-	Log( LOG_INFO, "Now listening on port %d (socket %d).", Port, sock );
+	if( Conf_ListenAddress[0]) Log( LOG_INFO, "Now listening on %s:%d (socket %d).", Conf_ListenAddress, Port, sock );
+	else Log( LOG_INFO, "Now listening on 0.0.0.0:%d (socket %d).", Port, sock );
 
 #ifdef RENDEZVOUS
 	/* Get best server description text */
@@ -299,12 +345,12 @@ Conn_NewListener( CONST UINT Port )
 	Rendezvous_Register( name, RENDEZVOUS_TYPE, Port );
 #endif
 
-	return TRUE;
+	return true;
 } /* Conn_NewListener */
 
 
-GLOBAL VOID
-Conn_Handler( VOID )
+GLOBAL void
+Conn_Handler( void )
 {
 	/* "Hauptschleife": Aktive Verbindungen ueberwachen. Folgende Aktionen
 	 * werden dabei durchgefuehrt, bis der Server terminieren oder neu
@@ -322,12 +368,12 @@ Conn_Handler( VOID )
 	struct timeval tv;
 	time_t start, t;
 	CONN_ID i, idx;
-	BOOLEAN timeout;
+	bool timeout;
 
 	start = time( NULL );
 	while(( ! NGIRCd_SignalQuit ) && ( ! NGIRCd_SignalRestart ))
 	{
-		timeout = TRUE;
+		timeout = true;
 
 #ifdef RENDEZVOUS
 		Rendezvous_Handler( );
@@ -340,13 +386,16 @@ Conn_Handler( VOID )
 		Check_Servers( );
 		Check_Connections( );
 
+		t = time( NULL );
+
 		/* noch volle Lese-Buffer suchen */
 		for( i = 0; i < Pool_Size; i++ )
 		{
-			if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].rdatalen > 0 ))
+			if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].rdatalen > 0 ) &&
+			 ( My_Connections[i].delaytime < t ))
 			{
 				/* Kann aus dem Buffer noch ein Befehl extrahiert werden? */
-				if( Handle_Buffer( i )) timeout = FALSE;
+				if( Handle_Buffer( i )) timeout = false;
 			}
 		}
 
@@ -354,7 +403,7 @@ Conn_Handler( VOID )
 		FD_ZERO( &write_sockets );
 		for( i = 0; i < Pool_Size; i++ )
 		{
-#ifdef USE_ZLIB
+#ifdef ZLIB
 			if(( My_Connections[i].sock > NONE ) && (( My_Connections[i].wdatalen > 0 ) || ( My_Connections[i].zip.wdatalen > 0 )))
 #else
 			if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].wdatalen > 0 ))
@@ -372,7 +421,6 @@ Conn_Handler( VOID )
 		}
 
 		/* von welchen Sockets koennte gelesen werden? */
-		t = time( NULL );
 		read_sockets = My_Sockets;
 		for( i = 0; i < Pool_Size; i++ )
 		{
@@ -403,9 +451,9 @@ Conn_Handler( VOID )
 
 		/* Timeout initialisieren */
 		tv.tv_usec = 0;
-		if( timeout ) tv.tv_sec = TIME_RES;
+		if( timeout ) tv.tv_sec = 1;
 		else tv.tv_sec = 0;
-		
+
 		/* Auf Aktivitaet warten */
 		i = select( Conn_MaxFD + 1, &read_sockets, &write_sockets, NULL, &tv );
 		if( i == 0 )
@@ -419,7 +467,7 @@ Conn_Handler( VOID )
 			if( errno != EINTR )
 			{
 				Log( LOG_EMERG, "Conn_Handler(): select(): %s!", strerror( errno ));
-				Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+				Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
 				exit( 1 );
 			}
 			continue;
@@ -433,7 +481,7 @@ Conn_Handler( VOID )
 			/* Es kann geschrieben werden ... */
 			idx = Socket2Index( i );
 			if( idx == NONE ) continue;
-			
+
 			if( ! Handle_Write( idx ))
 			{
 				/* Fehler beim Schreiben! Diesen Socket nun
@@ -455,22 +503,22 @@ Conn_Handler( VOID )
 
 
 #ifdef PROTOTYPES
-GLOBAL BOOLEAN
-Conn_WriteStr( CONN_ID Idx, CHAR *Format, ... )
+GLOBAL bool
+Conn_WriteStr( CONN_ID Idx, char *Format, ... )
 #else
-GLOBAL BOOLEAN
+GLOBAL bool 
 Conn_WriteStr( Idx, Format, va_alist )
 CONN_ID Idx;
-CHAR *Format;
+char *Format;
 va_dcl
 #endif
 {
 	/* String in Socket schreiben. CR+LF wird von dieser Funktion
 	 * automatisch angehaengt. Im Fehlerfall wird dir Verbindung
-	 * getrennt und FALSE geliefert. */
+	 * getrennt und false geliefert. */
 
-	CHAR buffer[COMMAND_LEN];
-	BOOLEAN ok;
+	char buffer[COMMAND_LEN];
+	bool ok;
 	va_list ap;
 
 	assert( Idx > NONE );
@@ -481,11 +529,11 @@ va_dcl
 #else
 	va_start( ap );
 #endif
-	if( vsnprintf( buffer, COMMAND_LEN - 2, Format, ap ) == COMMAND_LEN - 2 )
+	if( vsnprintf( buffer, COMMAND_LEN - 2, Format, ap ) >= COMMAND_LEN - 2 )
 	{
 		Log( LOG_CRIT, "Text too long to send (connection %d)!", Idx );
-		Conn_Close( Idx, "Text too long to send!", NULL, FALSE );
-		return FALSE;
+		Conn_Close( Idx, "Text too long to send!", NULL, false );
+		return false;
 	}
 
 #ifdef SNIFFER
@@ -501,11 +549,11 @@ va_dcl
 } /* Conn_WriteStr */
 
 
-GLOBAL BOOLEAN
-Conn_Write( CONN_ID Idx, CHAR *Data, INT Len )
+GLOBAL bool
+Conn_Write( CONN_ID Idx, char *Data, int Len )
 {
 	/* Daten in Socket schreiben. Bei "fatalen" Fehlern wird
-	 * der Client disconnectiert und FALSE geliefert. */
+	 * der Client disconnectiert und false geliefert. */
 
 	assert( Idx > NONE );
 	assert( Data != NULL );
@@ -517,8 +565,10 @@ Conn_Write( CONN_ID Idx, CHAR *Data, INT Len )
 	 * In diesem Fall wird hier einfach ein Fehler geliefert. */
 	if( My_Connections[Idx].sock <= NONE )
 	{
+#ifdef DEBUG
 		Log( LOG_DEBUG, "Skipped write on closed socket (connection %d).", Idx );
-		return FALSE;
+#endif
+		return false;
 	}
 
 	/* Pruefen, ob im Schreibpuffer genuegend Platz ist. Ziel ist es,
@@ -528,22 +578,22 @@ Conn_Write( CONN_ID Idx, CHAR *Data, INT Len )
 	{
 		/* Der Puffer ist dummerweise voll. Jetzt versuchen, den Puffer
 		 * zu schreiben, wenn das nicht klappt, haben wir ein Problem ... */
-		if( ! Try_Write( Idx )) return FALSE;
+		if( ! Try_Write( Idx )) return false;
 
 		/* nun neu pruefen: */
 		if( WRITEBUFFER_LEN - My_Connections[Idx].wdatalen - Len <= 0 )
 		{
 			Log( LOG_NOTICE, "Write buffer overflow (connection %d)!", Idx );
-			Conn_Close( Idx, "Write buffer overflow!", NULL, FALSE );
-			return FALSE;
+			Conn_Close( Idx, "Write buffer overflow!", NULL, false );
+			return false;
 		}
 	}
 
-#ifdef USE_ZLIB
+#ifdef ZLIB
 	if( My_Connections[Idx].options & CONN_ZIP )
 	{
 		/* Daten komprimieren und in Puffer kopieren */
-		if( ! Zip_Buffer( Idx, Data, Len )) return FALSE;
+		if( ! Zip_Buffer( Idx, Data, Len )) return false;
 	}
 	else
 #endif
@@ -557,36 +607,47 @@ Conn_Write( CONN_ID Idx, CHAR *Data, INT Len )
 	/* Adjust global write counter */
 	WCounter += Len;
 
-	return TRUE;
+	return true;
 } /* Conn_Write */
 
 
-GLOBAL VOID
-Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )
+GLOBAL void
+Conn_Close( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient )
 {
 	/* Close connection. Open pipes of asyncronous resolver
 	 * sub-processes are closed down. */
 
 	CLIENT *c;
-	DOUBLE in_k, out_k;
-#ifdef USE_ZLIB
-	DOUBLE in_z_k, out_z_k;
-	INT in_p, out_p;
+	char *txt;
+	double in_k, out_k;
+#ifdef ZLIB
+	double in_z_k, out_z_k;
+	int in_p, out_p;
 #endif
 
 	assert( Idx > NONE );
-	assert( My_Connections[Idx].sock > NONE );
 
 	/* Is this link already shutting down? */
 	if( My_Connections[Idx].options & CONN_ISCLOSING )
 	{
 		/* Conn_Close() has been called recursively for this link;
 		 * probabe reason: Try_Write() failed  -- see below. */
+#ifdef DEBUG
+		Log( LOG_DEBUG, "Recursive request to close connection: %d", Idx );
+#endif
 		return;
 	}
 
+	assert( My_Connections[Idx].sock > NONE );
+
 	/* Mark link as "closing" */
 	My_Connections[Idx].options |= CONN_ISCLOSING;
+		
+	if( LogMsg ) txt = LogMsg;
+	else txt = FwdMsg;
+	if( ! txt ) txt = "Reason unknown";
+
+	Log( LOG_INFO, "Shutting down connection %d (%s) with %s:%d ...", Idx, LogMsg ? LogMsg : FwdMsg, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port ));
 
 	/* Search client, if any */
 	c = Client_GetFromConn( Idx );
@@ -598,25 +659,24 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )
 		/* Send statistics to client if registered as user: */
 		if(( c != NULL ) && ( Client_Type( c ) == CLIENT_USER ))
 		{
-			Conn_WriteStr( Idx, "NOTICE %s :%sConnection statistics: client %.1f kb, server %.1f kb.", Client_ThisServer( ), NOTICE_TXTPREFIX, (DOUBLE)My_Connections[Idx].bytes_in / 1024,  (DOUBLE)My_Connections[Idx].bytes_out / 1024 );
+			Conn_WriteStr( Idx, "NOTICE %s :%sConnection statistics: client %.1f kb, server %.1f kb.", Client_ThisServer( ), NOTICE_TXTPREFIX, (double)My_Connections[Idx].bytes_in / 1024,  (double)My_Connections[Idx].bytes_out / 1024 );
 		}
 #endif
 
 		/* Send ERROR to client (see RFC!) */
 		if( FwdMsg ) Conn_WriteStr( Idx, "ERROR :%s", FwdMsg );
 		else Conn_WriteStr( Idx, "ERROR :Closing connection." );
-		if( My_Connections[Idx].sock == NONE ) return;
 	}
 
 	/* Try to write out the write buffer */
-	(VOID)Try_Write( Idx );
+	(void)Try_Write( Idx );
 
 	/* Shut down socket */
 	if( close( My_Connections[Idx].sock ) != 0 )
 	{
 		/* Oops, we can't close the socket!? This is fatal! */
 		Log( LOG_EMERG, "Error closing connection %d (socket %d) with %s:%d - %s!", Idx, My_Connections[Idx].sock, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port), strerror( errno ));
-		Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+		Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
 		exit( 1 );
 	}
 
@@ -626,18 +686,18 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )
 	My_Connections[Idx].sock = NONE;
 
 	/* If there is still a client, unregister it now */
-	if( c ) Client_Destroy( c, LogMsg, FwdMsg, TRUE );
+	if( c ) Client_Destroy( c, LogMsg, FwdMsg, true );
 
 	/* Calculate statistics and log information */
-	in_k = (DOUBLE)My_Connections[Idx].bytes_in / 1024;
-	out_k = (DOUBLE)My_Connections[Idx].bytes_out / 1024;
-#ifdef USE_ZLIB
+	in_k = (double)My_Connections[Idx].bytes_in / 1024;
+	out_k = (double)My_Connections[Idx].bytes_out / 1024;
+#ifdef ZLIB
 	if( My_Connections[Idx].options & CONN_ZIP )
 	{
-		in_z_k = (DOUBLE)My_Connections[Idx].zip.bytes_in / 1024;
-		out_z_k = (DOUBLE)My_Connections[Idx].zip.bytes_out / 1024;
-		in_p = (INT)(( in_k * 100 ) / in_z_k );
-		out_p = (INT)(( out_k * 100 ) / out_z_k );
+		in_z_k = (double)My_Connections[Idx].zip.bytes_in / 1024;
+		out_z_k = (double)My_Connections[Idx].zip.bytes_out / 1024;
+		in_p = (int)(( in_k * 100 ) / in_z_k );
+		out_p = (int)(( out_k * 100 ) / out_z_k );
 		Log( LOG_INFO, "Connection %d with %s:%d closed (in: %.1fk/%.1fk/%d%%, out: %.1fk/%.1fk/%d%%).", Idx, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port ), in_k, in_z_k, in_p, out_k, out_z_k, out_p );
 	}
 	else
@@ -659,7 +719,7 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )
 	/* Servers: Modify time of next connect attempt? */
 	Conf_UnsetServer( Idx );
 
-#ifdef USE_ZLIB
+#ifdef ZLIB
 	/* Clean up zlib, if link was compressed */
 	if( Conn_Options( Idx ) & CONN_ZIP )
 	{
@@ -670,16 +730,51 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )
 
 	/* Clean up connection structure (=free it) */
 	Init_Conn_Struct( Idx );
+
+#ifdef DEBUG
+	Log( LOG_DEBUG, "Shutdown of connection %d completed.", Idx );
+#endif
 } /* Conn_Close */
 
 
-LOCAL BOOLEAN
+GLOBAL void
+Conn_SyncServerStruct( void )
+{
+	/* Synchronize server structures (connection IDs):
+	 * connections <-> configuration */
+
+	CLIENT *client;
+	CONN_ID i;
+	int c;
+
+	for( i = 0; i < Pool_Size; i++ )
+	{
+		/* Established connection? */
+		if( My_Connections[i].sock <= NONE ) continue;
+
+		/* Server connection? */
+		client = Client_GetFromConn( i );
+		if(( ! client ) || ( Client_Type( client ) != CLIENT_SERVER )) continue;
+
+		for( c = 0; c < MAX_SERVERS; c++ )
+		{
+			/* Configured server? */
+			if( ! Conf_Server[c].host[0] ) continue;
+
+			/* Duplicate? */
+			if( strcmp( Conf_Server[c].name, Client_ID( client )) == 0 ) Conf_Server[c].conn_id = i;
+		}
+	}
+} /* SyncServerStruct */
+
+
+LOCAL bool
 Try_Write( CONN_ID Idx )
 {
 	/* Versuchen, Daten aus dem Schreib-Puffer in den Socket zu
-	 * schreiben. TRUE wird geliefert, wenn entweder keine Daten
+	 * schreiben. true wird geliefert, wenn entweder keine Daten
 	 * zum Versenden vorhanden sind oder erfolgreich bearbeitet
-	 * werden konnten. Im Fehlerfall wird FALSE geliefert und
+	 * werden konnten. Im Fehlerfall wird false geliefert und
 	 * die Verbindung geschlossen. */
 
 	fd_set write_socket;
@@ -689,10 +784,10 @@ Try_Write( CONN_ID Idx )
 	assert( My_Connections[Idx].sock > NONE );
 
 	/* sind ueberhaupt Daten vorhanden? */
-#ifdef USE_ZLIB
-	if(( ! My_Connections[Idx].wdatalen > 0 ) && ( ! My_Connections[Idx].zip.wdatalen )) return TRUE;
+#ifdef ZLIB
+	if(( ! My_Connections[Idx].wdatalen > 0 ) && ( ! My_Connections[Idx].zip.wdatalen )) return true;
 #else
-	if( ! My_Connections[Idx].wdatalen > 0 ) return TRUE;
+	if( ! My_Connections[Idx].wdatalen > 0 ) return true; 
 #endif
 
 	/* Timeout initialisieren: 0 Sekunden, also nicht blockieren */
@@ -706,18 +801,18 @@ Try_Write( CONN_ID Idx )
 		if( errno != EINTR )
 		{
 			Log( LOG_ALERT, "Try_Write(): select() failed: %s (con=%d, sock=%d)!", strerror( errno ), Idx, My_Connections[Idx].sock );
-			Conn_Close( Idx, "Server error!", NULL, FALSE );
-			return FALSE;
+			Conn_Close( Idx, "Server error!", NULL, false );
+			return false;
 		}
 	}
 
 	if( FD_ISSET( My_Connections[Idx].sock, &write_socket )) return Handle_Write( Idx );
-	else return TRUE;
+	else return true;
 } /* Try_Write */
 
 
-LOCAL VOID
-Handle_Read( INT Sock )
+LOCAL void
+Handle_Read( int Sock )
 {
 	/* Aktivitaet auf einem Socket verarbeiten:
 	 *  - neue Clients annehmen,
@@ -751,12 +846,13 @@ Handle_Read( INT Sock )
 } /* Handle_Read */
 
 
-LOCAL BOOLEAN
+LOCAL bool
 Handle_Write( CONN_ID Idx )
 {
 	/* Daten aus Schreibpuffer versenden bzw. Connection aufbauen */
 
-	INT len, res, err;
+	int len, res, err;
+	socklen_t sock_len;
 	CLIENT *c;
 
 	assert( Idx > NONE );
@@ -770,9 +866,9 @@ Handle_Write( CONN_ID Idx )
 		FD_CLR( My_Connections[Idx].sock, &My_Connects );
 
 		/* Ergebnis des connect() ermitteln */
-		len = sizeof( err );
-		res = getsockopt( My_Connections[Idx].sock, SOL_SOCKET, SO_ERROR, &err, &len );
-		assert( len == sizeof( err ));
+		sock_len = sizeof( err );
+		res = getsockopt( My_Connections[Idx].sock, SOL_SOCKET, SO_ERROR, &err, &sock_len );
+		assert( sock_len == sizeof( err ));
 
 		/* Fehler aufgetreten? */
 		if(( res != 0 ) || ( err != 0 ))
@@ -792,16 +888,16 @@ Handle_Write( CONN_ID Idx )
 			Conf_Server[Conf_GetServer( Idx )].lasttry = time( NULL );
 			Conf_UnsetServer( Idx );
 
-			return FALSE;
+			return false;
 		}
-		Log( LOG_DEBUG, "Connection %d with \"%s:%d\" established, now sendig PASS and SERVER ...", Idx, My_Connections[Idx].host, Conf_Server[Conf_GetServer( Idx )].port );
+		Log( LOG_INFO, "Connection %d with \"%s:%d\" established. Now logging in ...", Idx, My_Connections[Idx].host, Conf_Server[Conf_GetServer( Idx )].port );
 
-		/* PASS und SERVER verschicken */
+		/* Send PASS and SERVER command to peer */
 		Conn_WriteStr( Idx, "PASS %s %s", Conf_Server[Conf_GetServer( Idx )].pwd_out, NGIRCd_ProtoID );
 		return Conn_WriteStr( Idx, "SERVER %s :%s", Conf_ServerName, Conf_ServerInfo );
 	}
 
-#ifdef USE_ZLIB
+#ifdef ZLIB
 	/* Schreibpuffer leer, aber noch Daten im Kompressionsbuffer?
 	 * Dann muss dieser nun geflushed werden! */
 	if( My_Connections[Idx].wdatalen == 0 ) Zip_Flush( Idx );
@@ -814,35 +910,38 @@ Handle_Write( CONN_ID Idx )
 	if( len < 0 )
 	{
 		/* Operation haette Socket "nur" blockiert ... */
-		if( errno == EAGAIN ) return TRUE;
+		if( errno == EAGAIN ) return true;
 
 		/* Oops, ein Fehler! */
 		Log( LOG_ERR, "Write error on connection %d (socket %d): %s!", Idx, My_Connections[Idx].sock, strerror( errno ));
-		Conn_Close( Idx, "Write error!", NULL, FALSE );
-		return FALSE;
+		Conn_Close( Idx, "Write error!", NULL, false );
+		return false;
 	}
 
 	/* Puffer anpassen */
 	My_Connections[Idx].wdatalen -= len;
 	memmove( My_Connections[Idx].wbuf, My_Connections[Idx].wbuf + len, My_Connections[Idx].wdatalen );
 
-	return TRUE;
+	return true;
 } /* Handle_Write */
 
 
-LOCAL VOID
-New_Connection( INT Sock )
+LOCAL void
+New_Connection( int Sock )
 {
 	/* Neue Client-Verbindung von Listen-Socket annehmen und
 	 * CLIENT-Struktur anlegen. */
 
+#ifdef TCPWRAP
+	struct request_info req;
+#endif
 	struct sockaddr_in new_addr;
-	INT new_sock, new_sock_len;
+	int new_sock, new_sock_len;
 	RES_STAT *s;
 	CONN_ID idx;
 	CLIENT *c;
 	POINTER *ptr;
-	LONG new_size;
+	long new_size, cnt;
 
 	assert( Sock > NONE );
 
@@ -855,18 +954,43 @@ New_Connection( INT Sock )
 		return;
 	}
 
+#ifdef TCPWRAP
+	/* Validate socket using TCP Wrappers */
+	request_init( &req, RQ_DAEMON, PACKAGE_NAME, RQ_FILE, new_sock, RQ_CLIENT_SIN, &new_addr, NULL );
+	fromhost(&req);
+	if( ! hosts_access( &req ))
+	{
+		/* Access denied! */
+		Log( deny_severity, "Refused connection from %s (by TCP Wrappers)!", inet_ntoa( new_addr.sin_addr ));
+		Simple_Message( new_sock, "ERROR :Connection refused" );
+		close( new_sock );
+		return;
+	}
+#endif
+
 	/* Socket initialisieren */
 	Init_Socket( new_sock );
+	
+	/* Check IP-based connection limit */
+	cnt = Count_Connections( new_addr );
+	if(( Conf_MaxConnectionsIP > 0 ) && ( cnt >= Conf_MaxConnectionsIP ))
+	{
+		/* Access denied, too many connections from this IP address! */
+		Log( LOG_ERR, "Refused connection from %s: too may connections (%ld) from this IP address!", inet_ntoa( new_addr.sin_addr ), cnt);
+		Simple_Message( new_sock, "ERROR :Connection refused, too many connections from your IP address!" );
+		close( new_sock );
+		return;
+	}
 
 	/* Freie Connection-Struktur suchen */
 	for( idx = 0; idx < Pool_Size; idx++ ) if( My_Connections[idx].sock == NONE ) break;
 	if( idx >= Pool_Size )
 	{
 		new_size = Pool_Size + CONNECTION_POOL;
-		
+
 		/* Im bisherigen Pool wurde keine freie Connection-Struktur mehr gefunden.
 		 * Wenn erlaubt und moeglich muss nun der Pool vergroessert werden: */
-		
+
 		if( Conf_MaxConnections > 0 )
 		{
 			/* Es ist ein Limit konfiguriert */
@@ -874,6 +998,7 @@ New_Connection( INT Sock )
 			{
 				/* Mehr Verbindungen duerfen wir leider nicht mehr annehmen ... */
 				Log( LOG_ALERT, "Can't accept connection: limit (%d) reached!", Pool_Size );
+				Simple_Message( new_sock, "ERROR :Connection limit reached" );
 				close( new_sock );
 				return;
 			}
@@ -882,49 +1007,41 @@ New_Connection( INT Sock )
 		if( new_size < Pool_Size )
 		{
 			Log( LOG_ALERT, "Can't accespt connection: limit (%d) reached -- overflow!", Pool_Size );
+			Simple_Message( new_sock, "ERROR :Connection limit reached" );
 			close( new_sock );
 			return;
 		}
-		
-		/* zunaechst realloc() versuchen; wenn das scheitert, malloc() versuchen
-		 * und Daten ggf. "haendisch" umkopieren. (Haesslich! Eine wirklich
-		 * dynamische Verwaltung waere wohl _deutlich_ besser ...) */
-		ptr = realloc( My_Connections, sizeof( CONNECTION ) * new_size );
+
+		ptr = (POINTER *)realloc( My_Connections, sizeof( CONNECTION ) * new_size );
 		if( ! ptr )
 		{
-			/* realloc() ist fehlgeschlagen. Nun malloc() probieren: */
-			ptr = malloc( sizeof( CONNECTION ) * new_size );
-			if( ! ptr )
-			{
-				/* Offenbar steht kein weiterer Sepeicher zur Verfuegung :-( */
-				Log( LOG_EMERG, "Can't allocate memory! [New_Connection]" );
-				close( new_sock );
-				return;
-			}
-			
-			/* Struktur umkopieren ... */
-			memcpy( ptr, My_Connections, sizeof( CONNECTION ) * Pool_Size );
-			
-			Log( LOG_DEBUG, "Allocated new connection pool for %ld items (%ld bytes). [malloc()/memcpy()]", new_size, sizeof( CONNECTION ) * new_size );
+			Log( LOG_EMERG, "Can't allocate memory! [New_Connection]" );
+			Simple_Message( new_sock, "ERROR: Internal error" );
+			close( new_sock );
+			return;
 		}
-		else Log( LOG_DEBUG, "Allocated new connection pool for %ld items (%ld bytes). [realloc()]", new_size, sizeof( CONNECTION ) * new_size );
-		
+
+#ifdef DEBUG
+		Log( LOG_DEBUG, "Allocated new connection pool for %ld items (%ld bytes). [realloc()]", new_size, sizeof( CONNECTION ) * new_size );
+#endif
+
 		/* Adjust pointer to new block */
-		My_Connections = ptr;
-		
+		My_Connections = (CONNECTION *)ptr;
+
 		/* Initialize new items */
 		for( idx = Pool_Size; idx < new_size; idx++ ) Init_Conn_Struct( idx );
 		idx = Pool_Size;
-		
+
 		/* Adjust new pool size */
 		Pool_Size = new_size;
 	}
 
 	/* Client-Struktur initialisieren */
-	c = Client_NewLocal( idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWN, FALSE );
+	c = Client_NewLocal( idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWN, false );
 	if( ! c )
 	{
 		Log( LOG_ALERT, "Can't accept connection: can't create client structure!" );
+		Simple_Message( new_sock, "ERROR :Internal error" );
 		close( new_sock );
 		return;
 	}
@@ -943,20 +1060,24 @@ New_Connection( INT Sock )
 	/* Hostnamen ermitteln */
 	strlcpy( My_Connections[idx].host, inet_ntoa( new_addr.sin_addr ), sizeof( My_Connections[idx].host ));
 	Client_SetHostname( c, My_Connections[idx].host );
+#ifdef IDENTAUTH
+	s = Resolve_Addr( &new_addr, My_Connections[idx].sock );
+#else
 	s = Resolve_Addr( &new_addr );
+#endif
 	if( s )
 	{
 		/* Sub-Prozess wurde asyncron gestartet */
 		My_Connections[idx].res_stat = s;
 	}
-	
+
 	/* Penalty-Zeit setzen */
 	Conn_SetPenalty( idx, 4 );
 } /* New_Connection */
 
 
 LOCAL CONN_ID
-Socket2Index( INT Sock )
+Socket2Index( int Sock )
 {
 	/* zum Socket passende Connection suchen */
 
@@ -970,21 +1091,23 @@ Socket2Index( INT Sock )
 	{
 		/* die Connection wurde vermutlich (wegen eines
 		 * Fehlers) bereits wieder abgebaut ... */
+#ifdef DEBUG
 		Log( LOG_DEBUG, "Socket2Index: can't get connection for socket %d!", Sock );
+#endif
 		return NONE;
 	}
 	else return idx;
 } /* Socket2Index */
 
 
-LOCAL VOID
+LOCAL void
 Read_Request( CONN_ID Idx )
 {
 	/* Daten von Socket einlesen und entsprechend behandeln.
 	 * Tritt ein Fehler auf, so wird der Socket geschlossen. */
 
-	INT len, bsize;
-#ifdef USE_ZLIB
+	int len, bsize;
+#ifdef ZLIB
 	CLIENT *c;
 #endif
 
@@ -994,24 +1117,24 @@ Read_Request( CONN_ID Idx )
 	/* wenn noch nicht registriert: maximal mit ZREADBUFFER_LEN arbeiten,
 	 * ansonsten koennen Daten ggf. nicht umkopiert werden. */
 	bsize = READBUFFER_LEN;
-#ifdef USE_ZLIB
+#ifdef ZLIB
 	c = Client_GetFromConn( Idx );
 	if(( Client_Type( c ) != CLIENT_USER ) && ( Client_Type( c ) != CLIENT_SERVER ) && ( Client_Type( c ) != CLIENT_SERVICE ) && ( bsize > ZREADBUFFER_LEN )) bsize = ZREADBUFFER_LEN;
 #endif
 
-#ifdef USE_ZLIB
+#ifdef ZLIB
 	if(( bsize - My_Connections[Idx].rdatalen - 1 < 1 ) || ( ZREADBUFFER_LEN - My_Connections[Idx].zip.rdatalen < 1 ))
 #else
 	if( bsize - My_Connections[Idx].rdatalen - 1 < 1 )
 #endif
 	{
 		/* Der Lesepuffer ist voll */
-		Log( LOG_ERR, "Read buffer overflow (connection %d): %d bytes!", Idx, My_Connections[Idx].rdatalen );
-		Conn_Close( Idx, "Read buffer overflow!", NULL, FALSE );
+		Log( LOG_ERR, "Receive buffer overflow (connection %d): %d bytes!", Idx, My_Connections[Idx].rdatalen );
+		Conn_Close( Idx, "Receive buffer overflow!", NULL, false );
 		return;
 	}
 
-#ifdef USE_ZLIB
+#ifdef ZLIB
 	if( My_Connections[Idx].options & CONN_ZIP )
 	{
 		len = recv( My_Connections[Idx].sock, My_Connections[Idx].zip.rbuf + My_Connections[Idx].zip.rdatalen, ( ZREADBUFFER_LEN - My_Connections[Idx].zip.rdatalen ), 0 );
@@ -1028,7 +1151,7 @@ Read_Request( CONN_ID Idx )
 	{
 		/* Socket wurde geschlossen */
 		Log( LOG_INFO, "%s:%d (%s) is closing the connection ...", My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port), inet_ntoa( My_Connections[Idx].addr.sin_addr ));
-		Conn_Close( Idx, "Socket closed!", "Client closed connection", FALSE );
+		Conn_Close( Idx, "Socket closed!", "Client closed connection", false );
 		return;
 	}
 
@@ -1039,7 +1162,7 @@ Read_Request( CONN_ID Idx )
 
 		/* Fehler beim Lesen */
 		Log( LOG_ERR, "Read error on connection %d (socket %d): %s!", Idx, My_Connections[Idx].sock, strerror( errno ));
-		Conn_Close( Idx, "Read error!", "Client closed connection", FALSE );
+		Conn_Close( Idx, "Read error!", "Client closed connection", false );
 		return;
 	}
 
@@ -1053,41 +1176,44 @@ Read_Request( CONN_ID Idx )
 } /* Read_Request */
 
 
-LOCAL BOOLEAN
+LOCAL bool
 Handle_Buffer( CONN_ID Idx )
 {
 	/* Daten im Lese-Puffer einer Verbindung verarbeiten.
-	 * Wurde ein Request verarbeitet, so wird TRUE geliefert,
-	 * ansonsten FALSE (auch bei Fehlern). */
+	 * Wurde ein Request verarbeitet, so wird true geliefert,
+	 * ansonsten false (auch bei Fehlern). */
 
 #ifndef STRICT_RFC
-	CHAR *ptr1, *ptr2;
+	char *ptr1, *ptr2;
 #endif
-	CHAR *ptr;
-	INT len, delta;
-	BOOLEAN action, result;
-#ifdef USE_ZLIB
-	BOOLEAN old_z;
+	char *ptr;
+	int len, delta;
+	bool action, result;
+#ifdef ZLIB
+	bool old_z;
 #endif
 
-	result = FALSE;
+	result = false;
 	do
 	{
-#ifdef USE_ZLIB
+		/* Check penalty */
+		if( My_Connections[Idx].delaytime > time( NULL )) return result;
+		
+#ifdef ZLIB
 		/* ggf. noch unkomprimiete Daten weiter entpacken */
 		if( My_Connections[Idx].options & CONN_ZIP )
 		{
-			if( ! Unzip_Buffer( Idx )) return FALSE;
+			if( ! Unzip_Buffer( Idx )) return false;
 		}
 #endif
-	
+
 		if( My_Connections[Idx].rdatalen < 1 ) break;
 
 		/* Eine komplette Anfrage muss mit CR+LF enden, vgl.
 		 * RFC 2812. Haben wir eine? */
 		My_Connections[Idx].rbuf[My_Connections[Idx].rdatalen] = '\0';
 		ptr = strstr( My_Connections[Idx].rbuf, "\r\n" );
-	
+
 		if( ptr ) delta = 2;
 #ifndef STRICT_RFC
 		else
@@ -1102,8 +1228,8 @@ Handle_Buffer( CONN_ID Idx )
 			else if( ptr2 ) ptr = ptr2;
 		}
 #endif
-	
-		action = FALSE;
+
+		action = false;
 		if( ptr )
 		{
 			/* Ende der Anfrage wurde gefunden */
@@ -1115,11 +1241,11 @@ Handle_Buffer( CONN_ID Idx )
 				 * (incl. CR+LF!) werden; vgl. RFC 2812. Wenn soetwas
 				 * empfangen wird, wird der Client disconnectiert. */
 				Log( LOG_ERR, "Request too long (connection %d): %d bytes (max. %d expected)!", Idx, My_Connections[Idx].rdatalen, COMMAND_LEN - 1 );
-				Conn_Close( Idx, NULL, "Request too long", TRUE );
-				return FALSE;
+				Conn_Close( Idx, NULL, "Request too long", true );
+				return false;
 			}
 
-#ifdef USE_ZLIB
+#ifdef ZLIB
 			/* merken, ob Stream bereits komprimiert wird */
 			old_z = My_Connections[Idx].options & CONN_ZIP;
 #endif
@@ -1128,45 +1254,45 @@ Handle_Buffer( CONN_ID Idx )
 			{
 				/* Es wurde ein Request gelesen */
 				My_Connections[Idx].msg_in++;
-				if( ! Parse_Request( Idx, My_Connections[Idx].rbuf )) return FALSE;
-				else action = TRUE;
+				if( ! Parse_Request( Idx, My_Connections[Idx].rbuf )) return false;
+				else action = true;
 			}
 
 			/* Puffer anpassen */
 			My_Connections[Idx].rdatalen -= len;
 			memmove( My_Connections[Idx].rbuf, My_Connections[Idx].rbuf + len, My_Connections[Idx].rdatalen );
 
-#ifdef USE_ZLIB
+#ifdef ZLIB
 			if(( ! old_z ) && ( My_Connections[Idx].options & CONN_ZIP ) && ( My_Connections[Idx].rdatalen > 0 ))
 			{
 				/* Mit dem letzten Befehl wurde Socket-Kompression aktiviert.
 				 * Evtl. schon vom Socket gelesene Daten in den Unzip-Puffer
 				 * umkopieren, damit diese nun zunaechst entkomprimiert werden */
+				if( My_Connections[Idx].rdatalen > ZREADBUFFER_LEN )
 				{
-					if( My_Connections[Idx].rdatalen > ZREADBUFFER_LEN )
-					{
-						/* Hupsa! Soviel Platz haben wir aber gar nicht! */
-						Log( LOG_ALERT, "Can't move read buffer: No space left in unzip buffer (need %d bytes)!", My_Connections[Idx].rdatalen );
-						return FALSE;
-					}
-					memcpy( My_Connections[Idx].zip.rbuf, My_Connections[Idx].rbuf, My_Connections[Idx].rdatalen );
-					My_Connections[Idx].zip.rdatalen = My_Connections[Idx].rdatalen;
-					My_Connections[Idx].rdatalen = 0;
-					Log( LOG_DEBUG, "Moved already received data (%d bytes) to uncompression buffer.", My_Connections[Idx].zip.rdatalen );
+					/* Hupsa! Soviel Platz haben wir aber gar nicht! */
+					Log( LOG_ALERT, "Can't move receive buffer: No space left in unzip buffer (need %d bytes)!", My_Connections[Idx].rdatalen );
+					return false;
 				}
+				memcpy( My_Connections[Idx].zip.rbuf, My_Connections[Idx].rbuf, My_Connections[Idx].rdatalen );
+				My_Connections[Idx].zip.rdatalen = My_Connections[Idx].rdatalen;
+				My_Connections[Idx].rdatalen = 0;
+#ifdef DEBUG
+				Log( LOG_DEBUG, "Moved already received data (%d bytes) to uncompression buffer.", My_Connections[Idx].zip.rdatalen );
+#endif /* DEBUG */
 			}
-#endif
+#endif /* ZLIB */
 		}
-		
-		if( action ) result = TRUE;
+
+		if( action ) result = true;
 	} while( action );
-	
+
 	return result;
 } /* Handle_Buffer */
 
 
-LOCAL VOID
-Check_Connections( VOID )
+LOCAL void
+Check_Connections( void )
 {
 	/* Pruefen, ob Verbindungen noch "alive" sind. Ist dies
 	 * nicht der Fall, zunaechst PING-PONG spielen und, wenn
@@ -1189,14 +1315,18 @@ Check_Connections( VOID )
 				if( My_Connections[i].lastping < time( NULL ) - Conf_PongTimeout )
 				{
 					/* Timeout */
+#ifdef DEBUG
 					Log( LOG_DEBUG, "Connection %d: Ping timeout: %d seconds.", i, Conf_PongTimeout );
-					Conn_Close( i, NULL, "Ping timeout", TRUE );
+#endif
+					Conn_Close( i, NULL, "Ping timeout", true );
 				}
 			}
 			else if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout )
 			{
 				/* es muss ein PING gesendet werden */
+#ifdef DEBUG
 				Log( LOG_DEBUG, "Connection %d: sending PING ...", i );
+#endif
 				My_Connections[i].lastping = time( NULL );
 				Conn_WriteStr( i, "PING :%s", Client_ID( Client_ThisServer( )));
 			}
@@ -1207,22 +1337,24 @@ Check_Connections( VOID )
 			if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout )
 			{
 				/* Timeout */
+#ifdef DEBUG
 				Log( LOG_DEBUG, "Connection %d timed out ...", i );
-				Conn_Close( i, NULL, "Timeout", FALSE );
+#endif
+				Conn_Close( i, NULL, "Timeout", false );
 			}
 		}
 	}
 } /* Check_Connections */
 
 
-LOCAL VOID
-Check_Servers( VOID )
+LOCAL void
+Check_Servers( void )
 {
 	/* Check if we can establish further server links */
 
 	RES_STAT *s;
 	CONN_ID idx;
-	INT i, n;
+	int i, n;
 
 	/* Serach all connections, are there results from the resolver? */
 	for( idx = 0; idx < Pool_Size; idx++ )
@@ -1263,7 +1395,9 @@ Check_Servers( VOID )
 			Log( LOG_ALERT, "Can't establist server connection: connection limit reached (%d)!", Pool_Size );
 			return;
 		}
+#ifdef DEBUG
 		Log( LOG_DEBUG, "Preparing connection %d for \"%s\" ...", idx, Conf_Server[i].host );
+#endif
 
 		/* Verbindungs-Struktur initialisieren */
 		Init_Conn_Struct( idx );
@@ -1283,24 +1417,25 @@ Check_Servers( VOID )
 } /* Check_Servers */
 
 
-LOCAL VOID
-New_Server( INT Server, CONN_ID Idx )
+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;
-	INT res, new_sock;
+	int res, new_sock;
 	CLIENT *c;
 
 	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;
 	}
@@ -1315,8 +1450,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;
 	}
@@ -1329,7 +1465,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;
 	}
@@ -1339,39 +1477,45 @@ 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;
 	}
 
 	/* Client-Struktur initialisieren */
-	c = Client_NewLocal( Idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWNSERVER, FALSE );
+	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;
-	
+
+#ifdef DEBUG
 	Log( LOG_DEBUG, "Registered new connection %d on socket %d.", Idx, My_Connections[Idx].sock );
+#endif
 } /* New_Server */
 
 
-LOCAL VOID
+LOCAL void
 Init_Conn_Struct( CONN_ID Idx )
 {
 	/* Connection-Struktur initialisieren */
@@ -1395,7 +1539,7 @@ Init_Conn_Struct( CONN_ID Idx )
 	My_Connections[Idx].flag = 0;
 	My_Connections[Idx].options = 0;
 
-#ifdef USE_ZLIB
+#ifdef ZLIB
 	My_Connections[Idx].zip.rbuf[0] = '\0';
 	My_Connections[Idx].zip.rdatalen = 0;
 	My_Connections[Idx].zip.wbuf[0] = '\0';
@@ -1406,95 +1550,207 @@ Init_Conn_Struct( CONN_ID Idx )
 } /* Init_Conn_Struct */
 
 
-LOCAL BOOLEAN
-Init_Socket( INT Sock )
+LOCAL bool
+Init_Socket( int Sock )
 {
-	/* Socket-Optionen setzen */
+	/* Initialize socket (set options) */
 
-	INT on = 1;
+	int value;
 
-#ifdef O_NONBLOCK	/* A/UX kennt das nicht? */
+#ifdef O_NONBLOCK	/* unknown on A/UX */
 	if( fcntl( Sock, F_SETFL, O_NONBLOCK ) != 0 )
 	{
-		Log( LOG_CRIT, "Can't enable non-blocking mode: %s!", strerror( errno ));
+		Log( LOG_CRIT, "Can't enable non-blocking mode for socket: %s!", strerror( errno ));
 		close( Sock );
-		return FALSE;
+		return false;
+	}
+#endif
+
+	/* Don't block this port after socket shutdown */
+	value = 1;
+	if( setsockopt( Sock, SOL_SOCKET, SO_REUSEADDR, &value, (socklen_t)sizeof( value )) != 0 )
+	{
+		Log( LOG_ERR, "Can't set socket option SO_REUSEADDR: %s!", strerror( errno ));
+		/* ignore this error */
 	}
+
+	/* Set type of service (TOS) */
+#if defined(IP_TOS) && defined(IPTOS_LOWDELAY)
+	value = IPTOS_LOWDELAY;
+#ifdef DEBUG
+	Log( LOG_DEBUG, "Setting option IP_TOS on socket %d to IPTOS_LOWDELAY (%d).", Sock, value );
 #endif
-	if( setsockopt( Sock, SOL_SOCKET, SO_REUSEADDR, &on, (socklen_t)sizeof( on )) != 0)
+	if( setsockopt( Sock, SOL_IP, IP_TOS, &value, (socklen_t)sizeof( value )) != 0 )
 	{
-		Log( LOG_ERR, "Can't set socket options: %s!", strerror( errno ));
-		/* dieser Fehler kann ignoriert werden. */
+		Log( LOG_ERR, "Can't set socket option IP_TOS: %s!", strerror( errno ));
+		/* ignore this error */
 	}
+#endif
 
-	return TRUE;
+	return true;
 } /* Init_Socket */
 
 
-LOCAL VOID
-Read_Resolver_Result( INT r_fd )
+LOCAL void
+Read_Resolver_Result( int r_fd )
 {
-	/* Ergebnis von Resolver Sub-Prozess aus Pipe lesen
-	 * und entsprechende Connection aktualisieren */
+	/* Read result of resolver sub-process from pipe and update the
+	 * apropriate connection/client structure(s): hostname and/or
+	 * IDENT user name.*/
 
-	CHAR result[HOST_LEN];
 	CLIENT *c;
-	INT len, i, n;
-
-	FD_CLR( r_fd, &Resolver_FDs );
-
-	/* Anfrage vom Parent lesen */
-	len = read( r_fd, result, HOST_LEN - 1 );
-	if( len < 0 )
-	{
-		/* Fehler beim Lesen aus der Pipe */
-		close( r_fd );
-		Log( LOG_CRIT, "Resolver: Can't read result: %s!", strerror( errno ));
-		return;
-	}
-	result[len] = '\0';
+	int len, i, n;
+	RES_STAT *s;
+	char *ptr;
 
-	/* zugehoerige Connection suchen */
+	/* Search associated connection ... */
 	for( i = 0; i < Pool_Size; i++ )
 	{
-		if(( My_Connections[i].sock != NONE ) && ( My_Connections[i].res_stat ) && ( My_Connections[i].res_stat->pipe[0] == r_fd )) break;
+		if(( My_Connections[i].sock != NONE )
+		  && ( My_Connections[i].res_stat != NULL )
+		  && ( My_Connections[i].res_stat->pipe[0] == r_fd ))
+			break;
 	}
 	if( i >= Pool_Size )
 	{
-		/* Opsa! Keine passende Connection gefunden!? Vermutlich
-		 * wurde sie schon wieder geschlossen. */
+		/* Ops, none found? Probably the connection has already
+		 * been closed!? We'll ignore that ... */
+		FD_CLR( r_fd, &Resolver_FDs );
 		close( r_fd );
+#ifdef DEBUG
 		Log( LOG_DEBUG, "Resolver: Got result for unknown connection!?" );
+#endif
 		return;
 	}
 
-	Log( LOG_DEBUG, "Resolver: %s is \"%s\".", My_Connections[i].host, result );
-	
-	/* Aufraeumen */
-	close( My_Connections[i].res_stat->pipe[0] );
-	close( My_Connections[i].res_stat->pipe[1] );
-	free( My_Connections[i].res_stat );
-	My_Connections[i].res_stat = NULL;
+	/* Get resolver structure */
+	s = My_Connections[i].res_stat;
+	assert( s != NULL );
+
+	/* Read result from pipe */
+	len = read( r_fd, s->buffer + s->bufpos, sizeof( s->buffer ) - s->bufpos - 1 );
+	if( len < 0 )
+	{
+		/* Error! */
+		close( r_fd );
+		Log( LOG_CRIT, "Resolver: Can't read result: %s!", strerror( errno ));
+		return;
+	}
+	s->bufpos += len;
+	s->buffer[s->bufpos] = '\0';
 
+	/* If the result string is incomplete, return to main loop and
+	 * wait until we can read in more bytes. */
+#ifdef IDENTAUTH
+try_resolve:
+#endif
+	ptr = strchr( s->buffer, '\n' );
+	if( ! ptr ) return;
+	*ptr = '\0';
+
+#ifdef DEBUG
+	Log( LOG_DEBUG, "Got result from resolver: \"%s\" (%d bytes), stage %d.", s->buffer, len, s->stage );
+#endif
+
+	/* Okay, we got a complete result: this is a host name for outgoing
+	 * connections and a host name or IDENT user name (if enabled) for
+	 * incoming conneciions.*/
 	if( My_Connections[i].sock > NONE )
 	{
-		/* Eingehende Verbindung: Hostnamen setzen */
+		/* Incoming connection */
+
+		/* Search client ... */
 		c = Client_GetFromConn( i );
 		assert( c != NULL );
-		strlcpy( My_Connections[i].host, result, sizeof( My_Connections[i].host ));
-		Client_SetHostname( c, result );
+
+		/* Only update client information of unregistered clients */
+		if( Client_Type( c ) == CLIENT_UNKNOWN )
+		{
+			if( s->stage == 0 )
+			{
+				/* host name */
+				strlcpy( My_Connections[i].host, s->buffer, sizeof( My_Connections[i].host ));
+				Client_SetHostname( c, s->buffer );
+
+#ifdef IDENTAUTH
+				/* clean up buffer for IDENT result */
+				len = strlen( s->buffer ) + 1;
+				memmove( s->buffer, s->buffer + len, sizeof( s->buffer ) - len );
+				s->bufpos -= len;
+
+				/* Don't close pipe and clean up, but
+				 * instead wait for IDENT result */
+				s->stage = 1;
+				goto try_resolve;
+			}
+			else if( s->stage == 1 )
+			{
+				/* IDENT user name */
+				if( s->buffer[0] )
+				{
+					Log( LOG_INFO, "IDENT lookup for connection %ld: \"%s\".", i, s->buffer );
+					Client_SetUser( c, s->buffer, true );
+				}
+				else Log( LOG_INFO, "IDENT lookup for connection %ld: no result.", i );
+#endif
+			}
+			else Log( LOG_ERR, "Resolver: got result for unknown stage %d!?", s->stage );
+		}
+#ifdef DEBUG
+		else Log( LOG_DEBUG, "Resolver: discarding result for already registered connection %d.", i );
+#endif
 	}
 	else
 	{
-		/* Ausgehende Verbindung (=Server): IP setzen */
+		/* Outgoing connection (server link): set the IP address
+		 * so that we can connect to it in the main loop. */
+
+		/* Search server ... */
 		n = Conf_GetServer( i );
-		if( n > NONE ) strlcpy( Conf_Server[n].ip, result, sizeof( Conf_Server[n].ip ));
-		else Log( LOG_ERR, "Got resolver result for non-configured server!?" );
+		assert( n > NONE );
+
+		strlcpy( Conf_Server[n].ip, s->buffer, sizeof( Conf_Server[n].ip ));
 	}
 
-	/* Penalty-Zeit zurueck setzen */
+	/* Clean up ... */
+	FD_CLR( r_fd, &Resolver_FDs );
+	close( My_Connections[i].res_stat->pipe[0] );
+	close( My_Connections[i].res_stat->pipe[1] );
+	free( My_Connections[i].res_stat );
+	My_Connections[i].res_stat = NULL;
+
+	/* Reset penalty time */
 	Conn_ResetPenalty( i );
 } /* Read_Resolver_Result */
 
 
+LOCAL void
+Simple_Message( int Sock, char *Msg )
+{
+	/* 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 );
+
+	(void)send( Sock, Msg, strlen( Msg ), 0 );
+	(void)send( Sock, "\r\n", 2, 0 );
+} /* Simple_Error */
+
+
+LOCAL int
+Count_Connections( struct sockaddr_in addr_in )
+{
+	int i, cnt;
+	
+	cnt = 0;
+	for( i = 0; i < Pool_Size; i++ )
+	{
+		if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].addr.sin_addr.s_addr == addr_in.sin_addr.s_addr )) cnt++;
+	}
+	return cnt;
+} /* Count_Connections */
+
+
 /* -eof- */