X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fconn.c;h=7f7dbb973f1aff51d7da13dfd0085d58022cf048;hb=c2f5399b516fba5ad973c46cc8838a16d0fa543b;hp=a5a5168bb166daf4327740d1934a3f464bbb5610;hpb=cf0505192c45aef8dfea946e81c919033dbbef72;p=ngircd-alex.git

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index a5a5168b..714ebe6f 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -1,388 +1,1687 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2005 Alexander Barton <alex@barton.de>
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an comBase beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: conn.c,v 1.5 2001/12/14 08:16:47 alex Exp $
- *
- * connect.h: Verwaltung aller Netz-Verbindungen ("connections")
- *
- * $Log: conn.c,v $
- * Revision 1.5  2001/12/14 08:16:47  alex
- * - Begonnen, Client-spezifische Lesepuffer zu implementieren.
- * - Umstellung auf Datentyp "CONN_ID".
- *
- * Revision 1.4  2001/12/13 02:04:16  alex
- * - boesen "Speicherschiesser" in Log() gefixt.
- *
- * Revision 1.3  2001/12/13 01:33:09  alex
- * - Conn_Handler() unterstuetzt nun einen Timeout.
- * - fuer Verbindungen werden keine FILE-Handles mehr benutzt.
- * - kleinere "Code Cleanups" ;-)
- *
- * Revision 1.2  2001/12/12 23:32:02  alex
- * - diverse Erweiterungen und Verbesserungen (u.a. sind nun mehrere
- *   Verbindungen und Listen-Sockets moeglich).
- *
- * Revision 1.1  2001/12/12 17:18:38  alex
- * - Modul zur Verwaltung aller Netzwerk-Verbindungen begonnen.
+ * Connection management
  */
 
 
-#include <portab.h>
-#include "global.h"
+#define CONN_MODULE
+
+#include "portab.h"
+#include "io.h"
+
+static char UNUSED id[] = "$Id: conn.c,v 1.170 2005/08/15 23:02:40 alex Exp $";
 
-#include <imp.h>
+#include "imp.h"
 #include <assert.h>
+#ifdef PROTOTYPES
+#	include <stdarg.h>
+#else
+#	include <varargs.h>
+#endif
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <string.h>
-#include <sys/socket.h> 
+#include <sys/socket.h>
 #include <sys/time.h>
-#include <sys/types.h> 
+#include <sys/types.h>
+#include <time.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
+
+#ifdef HAVE_NETINET_IP_H
+# include <netinet/ip.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#else
+# 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 "array.h"
+#include "defines.h"
+#include "resolve.h"
+
+#include "exp.h"
+#include "conn.h"
+
+#include "imp.h"
 #include "ngircd.h"
+#include "client.h"
+#include "conf.h"
+#include "conn-zip.h"
+#include "conn-func.h"
 #include "log.h"
+#include "parse.h"
 #include "tool.h"
 
-#include <exp.h>
-#include "conn.h"
+#ifdef ZEROCONF
+# include "rendezvous.h"
+#endif
+
+#include "exp.h"
+
+
+#define SERVER_WAIT (NONE - 1)
+
+
+static bool Handle_Write PARAMS(( CONN_ID Idx ));
+static int New_Connection PARAMS(( int Sock ));
+static CONN_ID Socket2Index PARAMS(( int Sock ));
+static void Read_Request PARAMS(( CONN_ID Idx ));
+static bool Handle_Buffer PARAMS(( CONN_ID Idx ));
+static void Check_Connections PARAMS(( void ));
+static void Check_Servers PARAMS(( void ));
+static void Init_Conn_Struct PARAMS(( CONN_ID Idx ));
+static bool Init_Socket PARAMS(( int Sock ));
+static void New_Server PARAMS(( int Server, CONN_ID Idx ));
+static void Simple_Message PARAMS(( int Sock, char *Msg ));
+static int Count_Connections PARAMS(( struct sockaddr_in addr ));
+static int NewListener PARAMS(( const UINT16 Port ));
+
+static array My_Listeners;
+
+#ifdef TCPWRAP
+int allow_severity = LOG_INFO;
+int deny_severity = LOG_ERR;
+#endif
+
+static void server_login PARAMS((CONN_ID idx));
 
+static void cb_clientserver PARAMS((int sock, short what));
 
-#define MAX_CONNECTIONS 100		/* max. Anzahl von Verbindungen an diesem Server */
+static void
+cb_listen(int sock, short irrelevant)
+{
+	(void) irrelevant;
+	New_Connection( sock );
+}
+
+
+static void
+cb_connserver(int sock, UNUSED short what)
+{
+	int res, err;
+	socklen_t sock_len;
+	CLIENT *c;
+	CONN_ID idx = Socket2Index( sock );
+	if (idx <= NONE) {
+#ifdef DEBUG
+		Log(LOG_DEBUG, "cb_connserver wants to write on unknown socket?!");
+#endif
+		io_close(sock);
+		return;
+	}
 
-#define LINE_LEN 512			/* Laenge eines Befehls, vgl. RFC 2812, 3.2 */
-#define BUFFER_LEN 2 * LINE_LEN;	/* Laenge des Lesepuffers je Verbindung */
+	assert( what & IO_WANTWRITE);
+
+	/* connect() finished, get result. */
+	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 )) {
+		if ( res != 0 ) 
+			Log( LOG_CRIT, "getsockopt (connection %d): %s!", idx, strerror( errno ));
+		else
+			Log( LOG_CRIT, "Can't connect socket to \"%s:%d\" (connection %d): %s!",
+				My_Connections[idx].host, Conf_Server[Conf_GetServer( idx )].port,
+										idx, strerror( err ));
+
+			/* Clean up socket, connection and client structures */
+			c = Client_GetFromConn( idx );
+			if( c ) Client_DestroyNow( c );
+			io_close( My_Connections[idx].sock );
+			Init_Conn_Struct( idx );
+
+			/* Bei Server-Verbindungen lasttry-Zeitpunkt auf "jetzt" setzen */
+			Conf_Server[Conf_GetServer( idx )].lasttry = time( NULL );
+			Conf_UnsetServer( idx );
+			return;
+	}
 
+	Conn_OPTION_DEL( &My_Connections[idx], CONN_ISCONNECTING );
+	server_login(idx);
+}
 
-typedef struct _Connection
+
+static void
+server_login(CONN_ID idx)
 {
-	INT sock;			/* Socket Handle */
-	struct sockaddr_in addr;	/* Adresse des Client */
-	CHAR buffer[BUFFER_LEN];	/* Lesepuffer */
-	INT datalen;			/* Laenge der Daten im Puffer */
-} CONNECTION;
+	Log( LOG_INFO, "Connection %d with \"%s:%d\" established. Now logging in ...", idx,
+			My_Connections[idx].host, Conf_Server[Conf_GetServer( idx )].port );
 
+	io_event_setcb( My_Connections[idx].sock, cb_clientserver);
+	io_event_add( My_Connections[idx].sock, IO_WANTREAD|IO_WANTWRITE);
 
-LOCAL VOID Handle_Socket( INT sock );
+	/* Send PASS and SERVER command to peer */
+	Conn_WriteStr( idx, "PASS %s %s", Conf_Server[Conf_GetServer( idx )].pwd_out, NGIRCd_ProtoID );
+	Conn_WriteStr( idx, "SERVER %s :%s", Conf_ServerName, Conf_ServerInfo );
+}
 
-LOCAL VOID New_Connection( INT Sock );
 
-LOCAL CONN_ID Socket2Index( INT Sock );
+static void
+cb_clientserver(int sock, short what)
+{
+	CONN_ID idx = Socket2Index( sock );
+	if (idx <= NONE) {
+#ifdef DEBUG
+		Log(LOG_WARNING, "WTF: cb_clientserver wants to write on unknown socket?!");
+#endif
+		io_close(sock);
+		return;
+	}
 
-LOCAL VOID Close_Connection( CONN_ID Idx );
-LOCAL VOID Read_Request( CONN_ID Idx );
+	if (what & IO_WANTREAD)
+		Read_Request( idx );
 
-LOCAL BOOLEAN Send( CONN_ID Idx, CHAR *Data );
+	if (what & IO_WANTWRITE)
+		Handle_Write( idx );
+}
 
 
-LOCAL fd_set My_Listener;
-LOCAL fd_set My_Sockets;
+static void
+FreeRes_stat( CONNECTION *c )
+{
+	assert( c != NULL );
+	assert( c->res_stat != NULL );
 
-LOCAL INT My_Max_Fd;
+	if (!c->res_stat) return;
 
-LOCAL CONNECTION My_Connections[MAX_CONNECTIONS];
+	io_close( c->res_stat->pipe[0] );
 
+	array_free(&c->res_stat->buffer);
+	free( c->res_stat );
+	c->res_stat = NULL;
+}
 
-GLOBAL VOID Conn_Init( VOID )
+
+GLOBAL void
+Conn_Init( void )
 {
+	/* Modul initialisieren: statische Strukturen "ausnullen". */
+
 	CONN_ID i;
 
-	/* zu Beginn haben wir keine Verbindungen */
-	FD_ZERO( &My_Listener );
-	FD_ZERO( &My_Sockets );
-	
-	My_Max_Fd = 0;
-	
-	/* Connection-Struktur initialisieren */
-	for( i = 0; i < MAX_CONNECTIONS; i++ )
+	/* Speicher fuer Verbindungs-Pool anfordern */
+	Pool_Size = CONNECTION_POOL;
+	if( Conf_MaxConnections > 0 )
+	{
+		/* konfiguriertes Limit beachten */
+		if( Pool_Size > Conf_MaxConnections ) Pool_Size = Conf_MaxConnections;
+	}
+	My_Connections = (CONNECTION *) calloc( Pool_Size,  sizeof( CONNECTION ) );
+	if( ! My_Connections )
 	{
-		My_Connections[i].sock = NONE;
-		My_Connections[i].datalen = 0;
+		/* Speicher konnte nicht alloziert werden! */
+		Log( LOG_EMERG, "Can't allocate memory! [Conn_Init]" );
+		exit( 1 );
 	}
+#ifdef DEBUG
+	Log( LOG_DEBUG, "Allocated connection pool for %d items (%ld bytes).", Pool_Size, sizeof( CONNECTION ) * Pool_Size );
+#endif
+
+	array_free( &My_Listeners );
+
+	/* Groesster File-Descriptor fuer select() */
+	Conn_MaxFD = 0;
+
+	/* Connection-Struktur initialisieren */
+	for( i = 0; i < Pool_Size; i++ ) Init_Conn_Struct( i );
+
+	/* Global write counter */
+	WCounter = 0;
 } /* 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;
-	
+
+#ifdef DEBUG
+	Log( LOG_DEBUG, "Shutting down all connections ..." );
+#endif
+
+	Conn_ExitListeners();
+
 	/* Sockets schliessen */
-	for( i = 0; i < My_Max_Fd + 1; i++ )
-	{
-		if( FD_ISSET( i, &My_Sockets ))
-		{
-			for( idx = 0; idx < MAX_CONNECTIONS; idx++ )
-			{
-				if( My_Connections[idx].sock == i ) break;
-			}
-			if( idx < MAX_CONNECTIONS ) Close_Connection( idx );
-			else if( FD_ISSET( i, &My_Listener ))
-			{
-				close( i );
-				Log( LOG_INFO, "Closed listening socket %d.", i );
-			}
-			else
-			{
-				close( i );
-				Log( LOG_WARNING, "Unknown connection %d closed.", i );
-			}
+	for( idx = 0; idx < Pool_Size; idx++ ) {
+		if( My_Connections[idx].sock > NONE ) {
+			Conn_Close( idx, NULL, NGIRCd_SignalRestart ?
+				"Server going down (restarting)":"Server going down", true );
+			continue;
 		}
 	}
+
+	free( My_Connections );
+	My_Connections = NULL;
+	Pool_Size = 0;
+	io_library_shutdown();
 } /* Conn_Exit */
 
 
-GLOBAL BOOLEAN Conn_New_Listener( CONST INT Port )
+static unsigned int
+ports_initlisteners(array *a, void (*func)(int,short))
 {
-	/* Neuen Listen-Socket erzeugen: der Server wartet dann
-	 * auf dem angegebenen Port auf Verbindungen. */
+	unsigned int created = 0, len;
+	int fd;
+	UINT16 *port;
+
+	len = array_length(a, sizeof (UINT16));
+	port = array_start(a);
+	while(len--) {
+		fd = NewListener( *port );
+		if (fd < 0) {
+			port++;
+			continue;
+		}
+		if (!io_event_create( fd, IO_WANTREAD, func )) {
+			Log( LOG_ERR, "io_event_create(): Could not add listening fd %d (port %u): %s!",
+							fd, (unsigned int) *port, strerror(errno));
+			close(fd);
+			port++;
+			continue;
+		}
+		created++;
+		port++;
+	}
+
+	return created;
+}
+
+
+GLOBAL int
+Conn_InitListeners( void )
+{
+	/* Initialize ports on which the server should accept connections */
+
+	unsigned int created;
+
+	if (!io_library_init(CONNECTION_POOL)) {
+		Log(LOG_EMERG, "Cannot initialize IO routines: %s", strerror(errno));
+		return -1;
+	}
+
+	created = ports_initlisteners(&Conf_ListenPorts, cb_listen);
+
+	return created;
+} /* Conn_InitListeners */
+
+
+GLOBAL void
+Conn_ExitListeners( void )
+{
+	/* Close down all listening sockets */
+	int *fd;
+	unsigned int arraylen;
+#ifdef ZEROCONF
+	Rendezvous_UnregisterListeners( );
+#endif
+
+	arraylen = array_length(&My_Listeners, sizeof (int));
+	Log( LOG_INFO, "Shutting down all listening sockets (%d)...", arraylen );
+	while(arraylen--) {
+		fd = (int*) array_get(&My_Listeners, sizeof (int), arraylen);
+		if (fd) {
+			close(*fd);
+#ifdef DEBUG
+			Log( LOG_DEBUG, "Listening socket %d closed.", *fd );
+		} else {
+			Log( LOG_DEBUG, "array_get pos %d returned NULL", arraylen );
+#endif
+		}
+	}
+	array_free(&My_Listeners);
+} /* Conn_ExitListeners */
+
+
+/* return new listening port file descriptor or -1 on failure */
+static int
+NewListener( const UINT16 Port )
+{
+	/* Create new listening socket on specified port */
 
 	struct sockaddr_in addr;
-	INT sock, on = 1;
+	struct in_addr inaddr;
+	int sock;
+#ifdef ZEROCONF
+	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 -1;
+		}
+	}
+	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_ALERT, "Can't create socket: %s", strerror( errno ));
-		return FALSE;
+		Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
+		return -1;
 	}
 
-	/* Socket-Optionen setzen */
-	if( fcntl( sock, F_SETFL, O_NONBLOCK ) != 0 )
-	{
-		Log( LOG_ALERT, "Can't enable non-blocking mode: %s", strerror( errno ));
-		close( sock );
-		return FALSE;
-	}
-	if( setsockopt( sock, SOL_SOCKET, SO_REUSEADDR, &on, (socklen_t)sizeof( on )) != 0)
-	{
-		Log( LOG_CRIT, "Can't set socket options: %s", strerror( errno ));
-		/* dieser Fehler kann ignoriert werden. */
-	}
+	if( ! Init_Socket( sock )) return -1;
 
 	/* an Port binden */
 	if( bind( sock, (struct sockaddr *)&addr, (socklen_t)sizeof( addr )) != 0 )
 	{
-		Log( LOG_ALERT, "Can't bind socket: %s", strerror( errno ));
+		Log( LOG_CRIT, "Can't bind socket: %s!", strerror( errno ));
 		close( sock );
-		return FALSE;
+		return -1;
 	}
 
 	/* in "listen mode" gehen :-) */
 	if( listen( sock, 10 ) != 0 )
 	{
-		Log( LOG_ALERT, "Can't listen on soecket: %s", strerror( errno ));
+		Log( LOG_CRIT, "Can't listen on soecket: %s!", strerror( errno ));
 		close( sock );
-		return FALSE;
+		return -1;
 	}
 
 	/* Neuen Listener in Strukturen einfuegen */
-	FD_SET( sock, &My_Listener );
-	FD_SET( sock, &My_Sockets );
-	
-	if( sock > My_Max_Fd ) My_Max_Fd = sock;
+	if (!array_catb( &My_Listeners,(char*) &sock, sizeof(int) )) {
+		Log( LOG_CRIT, "Can't add socket to My_Listeners array: %s!", strerror( errno ));
+		close( sock );
+		return -1;
+	}
 
-	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 );
 
-	return TRUE;
-} /* Conn_New_Listener */
+#ifdef ZEROCONF
+	/* Get best server description text */
+	if( ! Conf_ServerInfo[0] ) info = Conf_ServerName;
+	else
+	{
+		/* Use server info string */
+		info = NULL;
+		if( Conf_ServerInfo[0] == '[' )
+		{
+			/* Cut off leading hostname part in "[]" */
+			info = strchr( Conf_ServerInfo, ']' );
+			if( info )
+			{
+				info++;
+				while( *info == ' ' ) info++;
+			}
+		}
+		if( ! info ) info = Conf_ServerInfo;
+	}
+
+	/* Add port number to description if non-standard */
+	if( Port != 6667 ) snprintf( name, sizeof( name ), "%s (port %u)", info, Port );
+	else strlcpy( name, info, sizeof( name ));
+
+	/* Register service */
+	Rendezvous_Register( name, MDNS_TYPE, Port );
+#endif
+	return sock;
+} /* NewListener */
 
 
-GLOBAL VOID Conn_Handler( INT Timeout )
+GLOBAL void
+Conn_Handler( void )
 {
-	fd_set read_sockets;
+	/* "Main Loop.": Loop until a signal (for shutdown or restart) arrives.
+	 * Call io_dispatch() to check for read/writeable sockets every second
+	 * Wait for status change on pending connections (e.g: when the hostname has been resolved)
+	 * check for penalty/timeouts
+	 * handle input buffers
+	 */
+	int i;
+	unsigned int wdatalen;
 	struct timeval tv;
-	INT i;
+	time_t start, t;
+	bool timeout;
 
-	/* Timeout initialisieren */
-	tv.tv_sec = Timeout;
-	tv.tv_usec = 0;
-	
-	read_sockets = My_Sockets;
-	if( select( My_Max_Fd + 1, &read_sockets, NULL, NULL, &tv ) == -1 )
+	start = time( NULL );
+	while(( ! NGIRCd_SignalQuit ) && ( ! NGIRCd_SignalRestart ))
 	{
-		if( errno != EINTR ) Log( LOG_ALERT, "select(): %s", strerror( errno ));
-		return;
-	}
-	
-	for( i = 0; i < My_Max_Fd + 1; i++ )
-	{
-		if( FD_ISSET( i, &read_sockets )) Handle_Socket( i );
+		timeout = true;
+
+#ifdef ZEROCONF
+		Rendezvous_Handler( );
+#endif
+
+		/* Should the configuration be reloaded? */
+		if( NGIRCd_SignalRehash ) NGIRCd_Rehash( );
+
+		/* Check configured servers and established links */
+		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 ) && ( array_bytes(&My_Connections[i].rbuf) > 0 ) &&
+			 ( My_Connections[i].delaytime < t ))
+			{
+				/* Kann aus dem Buffer noch ein Befehl extrahiert werden? */
+				if (Handle_Buffer( i )) timeout = false;
+			}
+		}
+
+		/* noch volle Schreib-Puffer suchen */
+		for( i = 0; i < Pool_Size; i++ ) {
+			if ( My_Connections[i].sock <= NONE )
+				continue;
+
+			wdatalen = array_bytes(&My_Connections[i].wbuf);
+
+#ifdef ZLIB
+			if (( wdatalen > 0 ) || ( array_bytes(&My_Connections[i].zip.wbuf)> 0 ))
+#else
+			if ( wdatalen > 0 )
+#endif
+			{
+				/* Socket der Verbindung in Set aufnehmen */
+				io_event_add( My_Connections[i].sock, IO_WANTWRITE );
+			}
+		}
+
+		/* von welchen Sockets koennte gelesen werden? */
+		for (i = 0; i < Pool_Size; i++ ) {
+			if ( My_Connections[i].sock <= NONE )
+				continue;
+
+			if ( My_Connections[i].res_stat ) {
+				/* wait for completion of Resolver Sub-Process */
+				io_event_del( My_Connections[i].sock, IO_WANTREAD );
+				continue;
+			}
+
+			if ( Conn_OPTION_ISSET( &My_Connections[i], CONN_ISCONNECTING ))
+				continue;	/* wait for completion of connect() */
+
+			if( My_Connections[i].delaytime > t ) {
+				/* Fuer die Verbindung ist eine "Penalty-Zeit" gesetzt */
+				io_event_del( My_Connections[i].sock, IO_WANTREAD );
+				continue;
+			}
+			io_event_add( My_Connections[i].sock, IO_WANTREAD );
+		}
+
+		/* Timeout initialisieren */
+		tv.tv_usec = 0;
+		if( timeout ) tv.tv_sec = 1;
+		else tv.tv_sec = 0;
+
+		/* Auf Aktivitaet warten */
+		i = io_dispatch( &tv );
+		if (i == -1 && errno != EINTR ) {
+			Log(LOG_EMERG, "Conn_Handler(): io_dispatch(): %s!", strerror(errno));
+			Log(LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME);
+			exit( 1 );
+		}
 	}
+
+	if( NGIRCd_SignalQuit ) Log( LOG_NOTICE|LOG_snotice, "Server going down NOW!" );
+	else if( NGIRCd_SignalRestart ) Log( LOG_NOTICE|LOG_snotice, "Server restarting NOW!" );
 } /* Conn_Handler */
 
 
-LOCAL VOID Handle_Socket( INT Sock )
+/**
+ * Write a text string into the socket of a connection.
+ * This function automatically appends CR+LF to the string and validates that
+ * the result is a valid IRC message (oversized messages are shortened, for
+ * example). Then it calls the Conn_Write() function to do the actual sending.
+ * @param Idx Index fo the connection.
+ * @param Format Format string, see printf().
+ * @return true on success, false otherwise.
+ */
+#ifdef PROTOTYPES
+GLOBAL bool
+Conn_WriteStr( CONN_ID Idx, char *Format, ... )
+#else
+GLOBAL bool 
+Conn_WriteStr( Idx, Format, va_alist )
+CONN_ID Idx;
+char *Format;
+va_dcl
+#endif
 {
-	/* Aktivitaet auf einem Socket verarbeiten */
+	char buffer[COMMAND_LEN];
+	bool ok;
+	va_list ap;
+
+	assert( Idx > NONE );
+	assert( Format != NULL );
+
+#ifdef PROTOTYPES
+	va_start( ap, Format );
+#else
+	va_start( ap );
+#endif
+	if (vsnprintf( buffer, COMMAND_LEN - 2, Format, ap ) >= COMMAND_LEN - 2 ) {
+		/*
+		 * The string that should be written to the socket is longer
+		 * than the allowed size of COMMAND_LEN bytes (including both
+		 * the CR and LF characters). This can be caused by the
+		 * IRC_WriteXXX() functions when the prefix of this server had
+		 * to be added to an already "quite long" command line which
+		 * has been received from a regular IRC client, for example.
+		 * 
+		 * We are not allowed to send such "oversized" messages to
+		 * other servers and clients, see RFC 2812 2.3 and 2813 3.3
+		 * ("these messages SHALL NOT exceed 512 characters in length,
+		 * counting all characters including the trailing CR-LF").
+		 *
+		 * So we have a big problem here: we should send more bytes
+		 * to the network than we are allowed to and we don't know
+		 * the originator (any more). The "old" behaviour of blaming
+		 * the receiver ("next hop") is a bad idea (it could be just
+		 * an other server only routing the message!), so the only
+		 * option left is to shorten the string and to hope that the
+		 * result is still somewhat useful ...
+		 *                                                   -alex-
+		 */
+
+		strcpy (buffer + sizeof(buffer) - strlen(CUT_TXTSUFFIX) - 2 - 1,
+			CUT_TXTSUFFIX);
+	}
+
+#ifdef SNIFFER
+	if (NGIRCd_Sniffer)
+		Log(LOG_DEBUG, " -> connection %d: '%s'.", Idx, buffer);
+#endif
+
+	strlcat( buffer, "\r\n", sizeof( buffer ));
+	ok = Conn_Write( Idx, buffer, strlen( buffer ));
+	My_Connections[Idx].msg_out++;
+
+	va_end( ap );
+	return ok;
+} /* Conn_WriteStr */
 
-	CONN_ID idx;
 
-	if( FD_ISSET( Sock, &My_Listener ))
+GLOBAL bool
+Conn_Write( CONN_ID Idx, char *Data, unsigned int Len )
+{
+	/* Daten in Socket schreiben. Bei "fatalen" Fehlern wird
+	 * der Client disconnectiert und false geliefert. */
+
+	assert( Idx > NONE );
+	assert( Data != NULL );
+	assert( Len > 0 );
+
+	/* Ist der entsprechende Socket ueberhaupt noch offen? In einem
+	 * "Handler-Durchlauf" kann es passieren, dass dem nicht mehr so
+	 * ist, wenn einer von mehreren Conn_Write()'s fehlgeschlagen ist.
+	 * In diesem Fall wird hier einfach ein Fehler geliefert. */
+	if( My_Connections[Idx].sock <= NONE )
 	{
-		/* es ist einer unserer Listener-Sockets: es soll
-		 * also eine neue Verbindung aufgebaut werden. */
+#ifdef DEBUG
+		Log( LOG_DEBUG, "Skipped write on closed socket (connection %d).", Idx );
+#endif
+		return false;
+	}
 
-		New_Connection( Sock );
+	/* Pruefen, ob im Schreibpuffer genuegend Platz ist. Ziel ist es,
+	 * moeglichts viel im Puffer zu haben und _nicht_ gleich alles auf den
+	 * Socket zu schreiben (u.a. wg. Komprimierung). */
+	if( array_bytes(&My_Connections[Idx].wbuf) >= WRITEBUFFER_LEN) {
+		/* Der Puffer ist dummerweise voll. Jetzt versuchen, den Puffer
+		 * zu schreiben, wenn das nicht klappt, haben wir ein Problem ... */
+		if( ! Handle_Write( Idx )) return false;
+
+		/* check again: if our writebuf is twice als large as the initial limit: Kill connection */
+		if( array_bytes(&My_Connections[Idx].wbuf) >= (WRITEBUFFER_LEN*2)) {
+			Log( LOG_NOTICE, "Write buffer overflow (connection %d)!", Idx );
+			Conn_Close( Idx, "Write buffer overflow!", NULL, false );
+			return false;
+		}
+	}
+
+#ifdef ZLIB
+	if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) {
+		/* Daten komprimieren und in Puffer kopieren */
+		if( ! Zip_Buffer( Idx, Data, Len )) return false;
 	}
 	else
+#endif
 	{
-		/* Ein Client Socket: entweder ein User oder Server */
+		/* Daten in Puffer kopieren */
+		if (!array_catb( &My_Connections[Idx].wbuf, Data, Len ))
+			return false;
+
+		My_Connections[Idx].bytes_out += Len;
+	}
+
+	/* Adjust global write counter */
+	WCounter += Len;
+
+	return true;
+} /* Conn_Write */
+
+
+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;
+	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 );
+
+	/* Is this link already shutting down? */
+	if( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ISCLOSING )) {
+		/* Conn_Close() has been called recursively for this link;
+		 * probabe reason: Handle_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" */
+	Conn_OPTION_ADD( &My_Connections[Idx], CONN_ISCLOSING );
 		
-		idx = Socket2Index( Sock );
-		Read_Request( idx );
+	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 );
+
+	/* Should the client be informed? */
+	if (InformClient) {
+#ifndef STRICT_RFC
+		/* 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_ID(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.");
+	}
+
+	/* Try to write out the write buffer */
+	(void)Handle_Write( Idx );
+
+	/* Shut down socket */
+	if( ! io_close( My_Connections[Idx].sock ))
+	{
+		/* Oops, we can't close the socket!? This is ... ugly! */
+		Log( LOG_CRIT, "Error closing connection %d (socket %d) with %s:%d - %s! (ignored)", Idx, My_Connections[Idx].sock, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port), strerror( errno ));
+	}
+
+	/* Mark socket as invalid: */
+	My_Connections[Idx].sock = NONE;
+
+	/* If there is still a client, unregister it now */
+	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 ZLIB
+	if ( Conn_OPTION_ISSET( &My_Connections[Idx], 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 );
+		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 );
 	}
-} /* Handle_Socket */
+	else
+#endif
+	{
+		Log( LOG_INFO, "Connection %d with %s:%d closed (in: %.1fk, out: %.1fk).", Idx, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port ), in_k, out_k );
+	}
+
+	/* Is there a resolver sub-process running? */
+	if( My_Connections[Idx].res_stat )
+		FreeRes_stat( &My_Connections[Idx] );
 
+	/* Servers: Modify time of next connect attempt? */
+	Conf_UnsetServer( Idx );
 
-LOCAL VOID New_Connection( INT Sock )
+#ifdef ZLIB
+	/* Clean up zlib, if link was compressed */
+	if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) {
+		inflateEnd( &My_Connections[Idx].zip.in );
+		deflateEnd( &My_Connections[Idx].zip.out );
+		array_free(&My_Connections[Idx].zip.rbuf);
+		array_free(&My_Connections[Idx].zip.wbuf);
+	}
+#endif
+
+	array_free(&My_Connections[Idx].rbuf);
+	array_free(&My_Connections[Idx].wbuf);
+	/* Clean up connection structure (=free it) */
+	Init_Conn_Struct( Idx );
+
+#ifdef DEBUG
+	Log( LOG_DEBUG, "Shutdown of connection %d completed.", Idx );
+#endif
+} /* Conn_Close */
+
+
+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 */
+
+
+static bool
+Handle_Write( CONN_ID Idx )
 {
+	/* Daten aus Schreibpuffer versenden bzw. Connection aufbauen */
+
+	int len;
+	unsigned int wdatalen;
+
+	Log(LOG_DEBUG, "Handle_Write");
+	assert( Idx > NONE );
+	if ( My_Connections[Idx].sock < 0 ) {
+		Log(LOG_WARNING, "Handle_Write() on closed socket, idx %d", Idx);
+		return false;
+	}
+	assert( My_Connections[Idx].sock > NONE );
+
+	wdatalen = array_bytes(&My_Connections[Idx].wbuf );
+#ifdef ZLIB
+	if(( wdatalen == 0 ) && ( ! array_bytes(&My_Connections[Idx].zip.wbuf))) {
+		io_event_del(My_Connections[Idx].sock, IO_WANTWRITE );
+		return true;
+	}
+
+	/* write buffer empty, but not compression buf? -> flush compression buf. */
+	if( wdatalen == 0 ) Zip_Flush( Idx );
+#else
+	if( wdatalen == 0 ) {
+		io_event_del(My_Connections[Idx].sock, IO_WANTWRITE );
+		return true;
+	}
+#endif
+
+	wdatalen = array_bytes(&My_Connections[Idx].wbuf ); /* Zip_Flush may change wbuf  */
+	len = write( My_Connections[Idx].sock, array_start(&My_Connections[Idx].wbuf), wdatalen );
+	if( len < 0 ) {
+		if( errno == EAGAIN || errno == EINTR)
+			return true;
+
+		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;
+	}
+
+	/* move any data not yet written to beginning */
+	array_moveleft(&My_Connections[Idx].wbuf, 1, len);
+
+	return true;
+} /* Handle_Write */
+
+
+static int
+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, cnt;
 
+	assert( Sock > NONE );
+	/* Connection auf Listen-Socket annehmen */
 	new_sock_len = sizeof( new_addr );
 	new_sock = accept( Sock, (struct sockaddr *)&new_addr, (socklen_t *)&new_sock_len );
 	if( new_sock < 0 )
 	{
-		Log( LOG_CRIT, "Can't accept connection: %s", strerror( errno ));
-		return;
+		Log( LOG_CRIT, "Can't accept connection: %s!", strerror( errno ));
+		return -1;
 	}
-		
-	/* Freie Connection-Struktur suschen */
-	for( idx = 0; idx < MAX_CONNECTIONS; idx++ ) if( My_Connections[idx].sock < 0 ) break;
-	if( idx >= MAX_CONNECTIONS )
+
+#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 ))
 	{
-		Log( LOG_ALERT, "Can't accept connection: limit (%d) reached!", MAX_CONNECTIONS );
+		/* 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;
+		return -1;
+	}
+#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 -1;
+	}
+
+	/* 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 */
+			if( Pool_Size >= Conf_MaxConnections )
+			{
+				/* 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 -1;
+			}
+			if( new_size > Conf_MaxConnections ) new_size = Conf_MaxConnections;
+		}
+		if( new_size < Pool_Size )
+		{
+			Log( LOG_ALERT, "Can't accept connection: limit (%d) reached -- overflow!", Pool_Size );
+			Simple_Message( new_sock, "ERROR :Connection limit reached" );
+			close( new_sock );
+			return -1;
+		}
+
+		ptr = (POINTER *)realloc( My_Connections, sizeof( CONNECTION ) * new_size );
+		if( ! ptr ) {
+			Log( LOG_EMERG, "Can't allocate memory! [New_Connection]" );
+			Simple_Message( new_sock, "ERROR: Internal error" );
+			close( new_sock );
+			return -1;
+		}
+
+#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 = (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 );
+	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 -1;
 	}
 
 	/* Verbindung registrieren */
+	Init_Conn_Struct( idx );
 	My_Connections[idx].sock = new_sock;
 	My_Connections[idx].addr = new_addr;
 
 	/* Neuen Socket registrieren */
-	FD_SET( new_sock, &My_Sockets );
+	if (!io_event_create( new_sock, IO_WANTREAD, cb_clientserver)) {
+		Simple_Message( new_sock, "ERROR :Internal error" );
+		Conn_Close( idx, "io_event_create() failed", NULL, false );
+		return -1;
+	}
 
-	if( new_sock > My_Max_Fd ) My_Max_Fd = new_sock;
+	Log( LOG_INFO, "Accepted connection %d from %s:%d on socket %d.", idx, inet_ntoa( new_addr.sin_addr ), ntohs( new_addr.sin_port), Sock );
 
-	Send( idx, "hello world!\n" );
+	/* 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
+	/* resolver process has been started */
+	if( s ) My_Connections[idx].res_stat = s;
 
-	Log( LOG_INFO, "Accepted connection from %s:%d on socket %d.", inet_ntoa( new_addr.sin_addr ), ntohs( new_addr.sin_port), Sock );
+	/* Penalty-Zeit setzen */
+	Conn_SetPenalty( idx, 4 );
+	return new_sock;
 } /* New_Connection */
 
 
-LOCAL CONN_ID Socket2Index( INT Sock )
+static CONN_ID
+Socket2Index( int Sock )
 {
+	/* zum Socket passende Connection suchen */
+
 	CONN_ID idx;
-	
-	for( idx = 0; idx < MAX_CONNECTIONS; idx++ ) if( My_Connections[idx].sock == Sock ) break;
-	assert( idx < MAX_CONNECTIONS );
-	
-	return idx;
+
+	assert( Sock > NONE );
+
+	for( idx = 0; idx < Pool_Size; idx++ ) if( My_Connections[idx].sock == Sock ) break;
+
+	if( idx >= Pool_Size )
+	{
+		/* 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 Close_Connection( CONN_ID Idx )
+static void
+Read_Request( CONN_ID Idx )
 {
-	/* Verbindung schlie§en */
+	/* Daten von Socket einlesen und entsprechend behandeln.
+	 * Tritt ein Fehler auf, so wird der Socket geschlossen. */
 
-	assert( My_Connections[Idx].sock >= 0 );
-	
-	if( close( My_Connections[Idx].sock ) != 0 )
+	int len;
+	char readbuf[1024];
+
+	assert( Idx > NONE );
+	assert( My_Connections[Idx].sock > NONE );
+
+#ifdef ZLIB
+	if (( array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN ) ||
+		( array_bytes(&My_Connections[Idx].zip.rbuf) >= ZREADBUFFER_LEN ))
+#else
+	if ( array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN )
+#endif
 	{
-		Log( LOG_ERR, "Error closing connection with %s:%d - %s", inet_ntoa( My_Connections[Idx].addr.sin_addr ), ntohs( My_Connections[Idx].addr.sin_port), strerror( errno ));
+		/* Der Lesepuffer ist voll */
+		Log( LOG_ERR, "Receive buffer overflow (connection %d): %d bytes!", Idx,
+						array_bytes(&My_Connections[Idx].rbuf));
+		Conn_Close( Idx, "Receive buffer overflow!", NULL, false );
+		return;
 	}
-	else
+
+	len = read( My_Connections[Idx].sock, readbuf, sizeof readbuf -1 );
+	if( len == 0 ) {
+		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 );
+		return;
+	}
+
+	if( len < 0 ) {
+		if( errno == EAGAIN ) return;
+		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 );
+		return;
+	}
+#ifdef ZLIB
+	if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) {
+		if (!array_catb( &My_Connections[Idx].zip.rbuf, readbuf, len)) {
+			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, false );
+			return;
+		}
+	} else
+#endif
+	{
+		readbuf[len] = 0;
+		if (!array_cats( &My_Connections[Idx].rbuf, readbuf )) {
+			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 );
+		}
+	}
+
+	/* Connection-Statistik aktualisieren */
+	My_Connections[Idx].bytes_in += len;
+
+	/* Timestamp aktualisieren */
+	My_Connections[Idx].lastdata = time( NULL );
+
+	Handle_Buffer( Idx );
+} /* Read_Request */
+
+
+static bool
+Handle_Buffer( CONN_ID Idx )
+{
+	/* Handle Data in Connections Read-Buffer.
+	 * Return true if a reuqest was handled, false otherwise (also returned on errors). */
+#ifndef STRICT_RFC
+	char *ptr1, *ptr2;
+#endif
+	char *ptr;
+	int len, delta;
+	bool action, result;
+#ifdef ZLIB
+	bool old_z;
+#endif
+
+	result = false;
+	do {
+		/* Check penalty */
+		if( My_Connections[Idx].delaytime > time( NULL )) return result;
+#ifdef ZLIB
+		/* unpack compressed data */
+		if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP ))
+			if( ! Unzip_Buffer( Idx )) return false;
+#endif
+
+		if (0 == array_bytes(&My_Connections[Idx].rbuf))
+			break;
+
+		if (!array_cat0_temporary(&My_Connections[Idx].rbuf)) /* make sure buf is NULL terminated */
+			return false;
+
+		/* A Complete Request end with CR+LF, see RFC 2812. */
+		ptr = strstr( array_start(&My_Connections[Idx].rbuf), "\r\n" );
+
+		if( ptr ) delta = 2; /* complete request */
+#ifndef STRICT_RFC
+		else {
+			/* Check for non-RFC-compliant request (only CR or LF)? Unfortunately,
+			 * there are quite a few clients that do this (incl. "mIRC" :-( */
+			ptr1 = strchr( array_start(&My_Connections[Idx].rbuf), '\r' );
+			ptr2 = strchr( array_start(&My_Connections[Idx].rbuf), '\n' );
+			delta = 1;
+			if( ptr1 && ptr2 ) ptr = ptr1 > ptr2 ? ptr2 : ptr1;
+			else if( ptr1 ) ptr = ptr1;
+			else if( ptr2 ) ptr = ptr2;
+		}
+#endif
+
+		action = false;
+		if( ! ptr )
+			break;
+
+		/* End of request found */
+		*ptr = '\0';
+
+		len = ( ptr - (char*) array_start(&My_Connections[Idx].rbuf)) + delta;
+
+		if( len < 0 || len > ( COMMAND_LEN - 1 )) {
+			/* Request must not exceed 512 chars (incl. CR+LF!), see
+			 * RFC 2812. Disconnect Client if this happens. */
+			Log( LOG_ERR, "Request too long (connection %d): %d bytes (max. %d expected)!",
+						Idx, array_bytes(&My_Connections[Idx].rbuf), COMMAND_LEN - 1 );
+			Conn_Close( Idx, NULL, "Request too long", true );
+			return false;
+		}
+
+#ifdef ZLIB
+		/* remember if stream is already compressed */
+		old_z = My_Connections[Idx].options & CONN_ZIP;
+#endif
+
+		if( len > delta )
+		{
+			/* A Request was read */
+			My_Connections[Idx].msg_in++;
+			if( ! Parse_Request( Idx, (char*)array_start(&My_Connections[Idx].rbuf) )) return false;
+			else action = true;
+
+			array_moveleft(&My_Connections[Idx].rbuf, 1, len);
+#ifdef DEBUG
+			Log(LOG_DEBUG, "%d byte left in rbuf", array_bytes(&My_Connections[Idx].rbuf));
+#endif
+		}
+
+#ifdef ZLIB
+		if(( ! old_z ) && ( My_Connections[Idx].options & CONN_ZIP ) && ( array_bytes(&My_Connections[Idx].rbuf) > 0 ))
+		{
+			/* The last Command activated Socket-Compression.
+			 * Data that was read after that needs to be copied to Unzip-buf
+			 * for decompression */
+			if( array_bytes(&My_Connections[Idx].rbuf)> ZREADBUFFER_LEN ) {
+				/* No space left */
+				Log( LOG_ALERT, "Can't move receive buffer: No space left in unzip buffer (need %d bytes)!", array_bytes(&My_Connections[Idx].rbuf ));
+				return false;
+			}
+			if (!array_copy( &My_Connections[Idx].zip.rbuf, &My_Connections[Idx].rbuf ))
+				return false;
+
+			array_trunc(&My_Connections[Idx].rbuf);
+#ifdef DEBUG
+			Log( LOG_DEBUG, "Moved already received data (%d bytes) to uncompression buffer.", array_bytes(&My_Connections[Idx].zip.rbuf));
+#endif /* DEBUG */
+		}
+#endif /* ZLIB */
+		if( action ) result = true;
+	} while( action );
+
+	return result;
+} /* Handle_Buffer */
+
+
+static void
+Check_Connections( void )
+{
+	/* check if connections are alive. if not, play PING-PONG first.
+	 * if this doesn't help either, disconnect client. */
+	CLIENT *c;
+	CONN_ID i;
+
+	for( i = 0; i < Pool_Size; i++ ) {
+		if( My_Connections[i].sock == NONE ) continue;
+
+		c = Client_GetFromConn( i );
+		if( c && (( Client_Type( c ) == CLIENT_USER ) || ( Client_Type( c ) == CLIENT_SERVER ) || ( Client_Type( c ) == CLIENT_SERVICE )))
+		{
+			/* connected User, Server or Service */
+			if( My_Connections[i].lastping > My_Connections[i].lastdata ) {
+				/* we already sent a ping */
+				if( My_Connections[i].lastping < time( NULL ) - Conf_PongTimeout ) {
+					/* Timeout */
+#ifdef DEBUG
+					Log( LOG_DEBUG, "Connection %d: Ping timeout: %d seconds.", i, Conf_PongTimeout );
+#endif
+					Conn_Close( i, NULL, "Ping timeout", true );
+				}
+			}
+			else if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout ) {
+				/* we need to sent a PING */
+#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( )));
+			}
+		}
+		else
+		{
+			/* connection is not fully established yet */
+			if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout )
+			{
+				/* Timeout */
+#ifdef DEBUG
+				Log( LOG_DEBUG, "Connection %d timed out ...", i );
+#endif
+				Conn_Close( i, NULL, "Timeout", false );
+			}
+		}
+	}
+} /* Check_Connections */
+
+
+static void
+Check_Servers( void )
+{
+	/* Check if we can establish further server links */
+
+	RES_STAT *s;
+	CONN_ID idx;
+	int i, n;
+
+	/* Serach all connections, are there results from the resolver? */
+	for( idx = 0; idx < Pool_Size; idx++ )
+	{
+		if( My_Connections[idx].sock != SERVER_WAIT ) continue;
+
+		/* IP resolved? */
+		if( My_Connections[idx].res_stat == NULL ) New_Server( Conf_GetServer( idx ), idx );
+	}
+
+	/* Check all configured servers */
+	for( i = 0; i < MAX_SERVERS; i++ )
 	{
-		Log( LOG_INFO, "Closed connection with %s:%d.", inet_ntoa( My_Connections[Idx].addr.sin_addr ), ntohs( My_Connections[Idx].addr.sin_port ));
+		/* Valid outgoing server which isn't already connected or disabled? */
+		if(( ! Conf_Server[i].host[0] ) || ( ! Conf_Server[i].port > 0 ) || ( Conf_Server[i].conn_id > NONE ) || ( Conf_Server[i].flags & CONF_SFLAG_DISABLED )) continue;
+
+		/* Is there already a connection in this group? */
+		if( Conf_Server[i].group > NONE )
+		{
+			for( n = 0; n < MAX_SERVERS; n++ )
+			{
+				if( n == i ) continue;
+				if(( Conf_Server[n].conn_id > NONE ) && ( Conf_Server[n].group == Conf_Server[i].group )) break;
+			}
+			if( n < MAX_SERVERS ) continue;
+		}
+
+		/* Check last connect attempt? */
+		if( Conf_Server[i].lasttry > time( NULL ) - Conf_ConnectRetry ) continue;
+
+		/* Okay, try to connect now */
+		Conf_Server[i].lasttry = time( NULL );
+
+		/* Search free connection structure */
+		for( idx = 0; idx < Pool_Size; idx++ ) if( My_Connections[idx].sock == NONE ) break;
+		if( idx >= Pool_Size )
+		{
+			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 );
+		My_Connections[idx].sock = SERVER_WAIT;
+		Conf_Server[i].conn_id = idx;
+
+		/* Resolve Hostname. If this fails, try to use it as an IP address */
+		strlcpy( Conf_Server[i].ip, Conf_Server[i].host, sizeof( Conf_Server[i].ip ));
+		strlcpy( My_Connections[idx].host, Conf_Server[i].host, sizeof( My_Connections[idx].host ));
+		s = Resolve_Name( Conf_Server[i].host );
+
+		/* resolver process running? */
+		if( s ) My_Connections[idx].res_stat = s;
 	}
+} /* Check_Servers */
+
+
+static void
+New_Server( int Server, CONN_ID Idx )
+{
+	/* Establish new server link */
+
+	struct sockaddr_in new_addr;
+	struct in_addr inaddr;
+	int res, new_sock;
+	CLIENT *c;
+
+	assert( Server > NONE );
+	assert( Idx > NONE );
+
+	/* Did we get a valid IP address? */
+	if( ! Conf_Server[Server].ip[0] ) {
+		/* No. Free connection structure and abort: */
+		Log( LOG_ERR, "Can't connect to \"%s\" (connection %d): ip address unknown!", Conf_Server[Server].host, Idx );
+		goto out;
+	}
+
+	Log( LOG_INFO, "Establishing connection to \"%s\", %s, port %d (connection %d) ... ", Conf_Server[Server].host, Conf_Server[Server].ip, Conf_Server[Server].port, Idx );
+
+#ifdef HAVE_INET_ATON
+	if( inet_aton( Conf_Server[Server].ip, &inaddr ) == 0 )
+#else
+	memset( &inaddr, 0, sizeof( inaddr ));
+	inaddr.s_addr = inet_addr( Conf_Server[Server].ip );
+	if( inaddr.s_addr == (unsigned)-1 )
+#endif
+	{
+		/* Can't convert IP address */
+		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 );
+		goto out;
+	}
+
+	memset( &new_addr, 0, sizeof( new_addr ));
+	new_addr.sin_family = AF_INET;
+	new_addr.sin_addr = inaddr;
+	new_addr.sin_port = htons( Conf_Server[Server].port );
+
+	new_sock = socket( PF_INET, SOCK_STREAM, 0 );
+	if ( new_sock < 0 ) {
+		/* Can't create socket */
+		Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
+		goto out;
+	}
+
+	if( ! Init_Socket( new_sock )) return;
+
+	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 );
+		goto out;
+	}
+
+	/* Client-Struktur initialisieren */
+	c = Client_NewLocal( Idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWNSERVER, false );
+	if( ! c ) {
+		/* Can't create new client structure */
+		Log( LOG_ALERT, "Can't establish connection: can't create client structure!" );
+		close( new_sock );
+		goto out;
+	}
+
+	Client_SetIntroducer( c, c );
+	Client_SetToken( c, TOKEN_OUTBOUND );
+
+	/* 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 ));
+
+	/* 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( Idx, "io_event_create() failed", NULL, false );
+		goto out;
+	}
+
+#ifdef DEBUG
+	Log( LOG_DEBUG, "Registered new connection %d on socket %d.", Idx, My_Connections[Idx].sock );
+#endif
+	Conn_OPTION_ADD( &My_Connections[Idx], CONN_ISCONNECTING );
+	return;
+out:
+	Init_Conn_Struct( Idx );
+	Conf_Server[Server].conn_id = NONE;
+} /* New_Server */
+
 
-	FD_CLR( My_Connections[Idx].sock, &My_Sockets );
+static void
+Init_Conn_Struct( CONN_ID Idx )
+{
+	time_t now = time( NULL );
+	/* Connection-Struktur initialisieren */
+
+	memset( &My_Connections[Idx], 0, sizeof ( CONNECTION ));
 	My_Connections[Idx].sock = NONE;
-} /* Close_Connection */
+	My_Connections[Idx].lastdata = now;
+	My_Connections[Idx].lastprivmsg = now;
+} /* Init_Conn_Struct */
 
 
-LOCAL VOID Read_Request( CONN_ID Idx )
+static bool
+Init_Socket( int Sock )
 {
-	/* Daten von Socket einlesen und entsprechend behandeln.
-	 * Tritt ein Fehler auf, so wird der Socket geschlossen. */
+	/* Initialize socket (set options) */
 
-	INT len;
-	
-	len = recv( My_Connections[Idx].sock, My_Connection[Idx].buffer + My_Connection[Idx].datalen, BUFFER_LEN - My_Connection[Idx].datalen - 1, 0 );
-	My_Connection[Idx].buffer[BUFFER_LEN] = '\0';
+	int value;
+
+	if (!io_setnonblock(Sock)) {
+		Log( LOG_CRIT, "Can't enable non-blocking mode for socket: %s!", strerror( errno ));
+		close( Sock );
+		return false;
+	}
 
-	if( len == 0 )
+	/* Don't block this port after socket shutdown */
+	value = 1;
+	if( setsockopt( Sock, SOL_SOCKET, SO_REUSEADDR, &value, (socklen_t)sizeof( value )) != 0 )
 	{
-		/* Socket wurde geschlossen */
-		Close_Connection( Idx );
-		return;
+		Log( LOG_ERR, "Can't set socket option SO_REUSEADDR: %s!", strerror( errno ));
+		/* ignore this error */
 	}
 
-	if( len < 0 )
+	/* 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_IP, IP_TOS, &value, (socklen_t)sizeof( value )) != 0 )
 	{
-		/* Fehler beim Lesen */
-		Log( LOG_ALERT, "Read error on socket %d!", My_Connections[Idx].sock );
-		Close_Connection( Idx );
-		return;
+		Log( LOG_ERR, "Can't set socket option IP_TOS: %s!", strerror( errno ));
+		/* ignore this error */
 	}
+#endif
 
-	My_Connection[Idx].datalen += len;
-	
-	ngt_Trim_Str( buffer );
-	printf( " in: '%s'\n", buffer );
-} /* Read_Data */
+	return true;
+} /* Init_Socket */
 
 
-LOCAL BOOLEAN Send( CONN_ID Idx, CHAR *Data )
+GLOBAL
+void Read_Resolver_Result( int r_fd )
 {
-	/* Daten in Socket schreiben, ggf. in mehreren Stuecken. Tritt
-	 * ein Fehler auf, so wird die Verbindung beendet und FALSE
-	 * als Rueckgabewert geliefert. */
-	
-	INT n, sent, len;
-		
-	sent = 0;
-	len = strlen( Data );
-	
-	while( sent < len )
+	/* Read result of resolver sub-process from pipe and update the
+	 * apropriate connection/client structure(s): hostname and/or
+	 * IDENT user name.*/
+
+	CLIENT *c;
+	int bytes_read, i, n;
+	unsigned int len;
+	RES_STAT *s;
+	char *ptr;
+	char *bufptr;
+	char readbuf[HOST_LEN];
+
+	Log( LOG_DEBUG, "Resolver: started, fd %d", r_fd );
+	/* Search associated connection ... */
+	for( i = 0; i < Pool_Size; i++ )
+	{
+		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 )
 	{
-		n = send( My_Connections[Idx].sock, Data + sent, len - sent, 0 );
-		if( n <= 0 )
+		/* Ops, none found? Probably the connection has already
+		 * been closed!? We'll ignore that ... */
+		io_close( r_fd );
+#ifdef DEBUG
+		Log( LOG_DEBUG, "Resolver: Got result for unknown connection!?" );
+#endif
+		return;
+	}
+
+	/* Get resolver structure */
+	s = My_Connections[i].res_stat;
+	assert( s != NULL );
+
+	/* Read result from pipe */
+	bytes_read = read( r_fd, readbuf, sizeof readbuf -1 );
+	if( bytes_read < 0 ) {
+		/* Error! */
+		Log( LOG_CRIT, "Resolver: Can't read result: %s!", strerror( errno ));
+		FreeRes_stat( &My_Connections[i] );
+		return;
+	}
+	len = (unsigned int) bytes_read;
+	readbuf[len] = '\0';
+	if (!array_catb(&s->buffer, readbuf, len)) {
+		Log( LOG_CRIT, "Resolver: Can't append result %s to buffer: %s", readbuf, strerror( errno ));
+		FreeRes_stat(&My_Connections[i]);
+		return;
+	}
+
+	if (!array_cat0_temporary(&s->buffer)) {
+		Log( LOG_CRIT, "Resolver: Can't append result %s to buffer: %s", readbuf, strerror( errno ));
+		FreeRes_stat(&My_Connections[i]);
+		return;
+	}
+
+	/* If the result string is incomplete, return to main loop and
+	 * wait until we can read in more bytes. */
+#ifdef IDENTAUTH
+try_resolve:
+#endif
+	bufptr = (char*) array_start(&s->buffer);
+	assert(bufptr != NULL);
+	ptr = strchr( bufptr, '\n' );
+	if( ! ptr ) return;
+	*ptr = '\0';
+
+#ifdef DEBUG
+	Log( LOG_DEBUG, "Got result from resolver: \"%s\" (%u bytes read), stage %d.", bufptr, 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 connections.*/
+	if( My_Connections[i].sock > NONE )
+	{
+		/* Incoming connection. Search client ... */
+		c = Client_GetFromConn( i );
+		assert( c != NULL );
+
+		/* Only update client information of unregistered clients */
+		if( Client_Type( c ) == CLIENT_UNKNOWN )
 		{
-			/* Oops, ein Fehler! */
-			Log( LOG_ALERT, "Write error on socket %d!", My_Connections[Idx].sock );
-			Close_Connection( Idx );
-			return FALSE;
+			switch(s->stage) {
+				case 0: /* host name */
+				strlcpy( My_Connections[i].host, bufptr, sizeof( My_Connections[i].host));
+
+				Client_SetHostname( c, bufptr);
+#ifdef IDENTAUTH
+				/* clean up buffer for IDENT result */
+				len = strlen(bufptr) + 1;
+				assert(len <= array_bytes(&s->buffer));
+				array_moveleft(&s->buffer, 1, len);
+
+				/* Don't close pipe and clean up, but
+				 * instead wait for IDENT result */
+				s->stage = 1;
+				goto try_resolve;
+
+				case 1: /* IDENT user name */
+				if (array_bytes(&s->buffer)) {
+					bufptr = (char*) array_start(&s->buffer);
+					Log( LOG_INFO, "IDENT lookup for connection %ld: \"%s\".", i, bufptr);
+					Client_SetUser( c, bufptr, true );
+				}
+				else Log( LOG_INFO, "IDENT lookup for connection %ld: no result.", i );
+#endif
+				break;
+				default:
+				Log( LOG_ERR, "Resolver: got result for unknown stage %d!?", s->stage );
+			}
 		}
-		sent += n;
+#ifdef DEBUG
+		else Log( LOG_DEBUG, "Resolver: discarding result for already registered connection %d.", i );
+#endif
+	}
+	else
+	{
+		/* 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 );
+		assert( n > NONE );
+
+		bufptr = (char*) array_start(&s->buffer);
+		strlcpy( Conf_Server[n].ip, bufptr, sizeof( Conf_Server[n].ip ));
+	}
+
+	/* Clean up ... */
+	FreeRes_stat( &My_Connections[i] );
+
+	/* Reset penalty time */
+	Conn_ResetPenalty( i );
+} /* Read_Resolver_Result */
+
+
+static void
+Simple_Message( int Sock, char *Msg )
+{
+	char buf[COMMAND_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);
+	strlcat( buf, "\r\n", sizeof buf);
+	(void)write( Sock, buf, strlen( buf ) );
+} /* Simple_Error */
+
+
+static 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 TRUE;
-} /* Send */
+	return cnt;
+} /* Count_Connections */
+
 
 
 /* -eof- */