X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconn.c;h=051309739c9a8495cf5f3889430be98814adb09a;hp=b63a89fbade8ecc17412cf54ffbe39e052f30131;hb=63e89ceb21c4a12d1f3d29342b45ed2a5e513b2b;hpb=02b0a5151719d04081af2db01e8266a1eafb8537

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index b63a89fb..05130973 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -17,7 +17,7 @@
 #include "portab.h"
 #include "io.h"
 
-static char UNUSED id[] = "$Id: conn.c,v 1.158 2005/07/08 16:18:39 alex Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.207 2007/05/09 13:21:11 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -82,27 +82,33 @@ static char UNUSED id[] = "$Id: conn.c,v 1.158 2005/07/08 16:18:39 alex Exp $";
 #define SERVER_WAIT (NONE - 1)
 
 
-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 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 Simple_Message PARAMS(( int Sock, char *Msg ));
-LOCAL int Count_Connections PARAMS(( struct sockaddr_in addr ));
+static bool Handle_Write PARAMS(( CONN_ID Idx ));
+static bool Conn_Write PARAMS(( CONN_ID Idx, char *Data, size_t Len ));
+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 ));
+static void Simple_Message PARAMS(( int Sock, const char *Msg ));
+static int Count_Connections PARAMS(( struct sockaddr_in addr ));
+static int NewListener PARAMS(( const UINT16 Port ));
 
 static array My_Listeners;
+static array My_ConnArray;
 
 #ifdef TCPWRAP
 int allow_severity = LOG_INFO;
 int deny_severity = LOG_ERR;
 #endif
 
+static void server_login PARAMS((CONN_ID idx));
 
+static void cb_Read_Resolver_Result PARAMS(( int sock, UNUSED short what));
+static void cb_Connect_to_Server PARAMS(( int sock, UNUSED short what));
 static void cb_clientserver PARAMS((int sock, short what));
 
 static void
@@ -114,16 +120,13 @@ cb_listen(int sock, short irrelevant)
 
 
 static void
-cb_connserver(int sock, short what)
+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
+		LogDebug("cb_connserver wants to write on unknown socket?!");
 		io_close(sock);
 		return;
 	}
@@ -135,29 +138,30 @@ cb_connserver(int sock, short what)
 	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;
+	/* Error while connecting? */
+ 	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));
+
+		Conn_Close(idx, "Can't connect!", NULL, false);
+		return;
 	}
 
 	Conn_OPTION_DEL( &My_Connections[idx], CONN_ISCONNECTING );
+	server_login(idx);
+}
+
 
+static void
+server_login(CONN_ID idx)
+{
 	Log( LOG_INFO, "Connection %d with \"%s:%d\" established. Now logging in ...", idx,
 			My_Connections[idx].host, Conf_Server[Conf_GetServer( idx )].port );
 
@@ -180,7 +184,7 @@ cb_clientserver(int sock, short what)
 #endif
 		io_close(sock);
 		return;
- 	}
+	}
 
 	if (what & IO_WANTREAD)
 		Read_Request( idx );
@@ -190,21 +194,6 @@ cb_clientserver(int sock, short what)
 }
 
 
-LOCAL void
-FreeRes_stat( CONNECTION *c )
-{
-	assert( c != NULL );
-	assert( c->res_stat != NULL );
-
-	if (!c->res_stat) return;
-
-	io_close( c->res_stat->pipe[0] );
-
-	free( c->res_stat );
-	c->res_stat = NULL;
-}
-
-
 GLOBAL void
 Conn_Init( void )
 {
@@ -219,21 +208,22 @@ Conn_Init( void )
 		/* konfiguriertes Limit beachten */
 		if( Pool_Size > Conf_MaxConnections ) Pool_Size = Conf_MaxConnections;
 	}
-	My_Connections = (CONNECTION *) calloc( Pool_Size,  sizeof( CONNECTION ) );
-	if( ! My_Connections )
-	{
-		/* Speicher konnte nicht alloziert werden! */
+	
+	if (!array_alloc(&My_ConnArray, sizeof(CONNECTION), (size_t)Pool_Size)) {
 		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 );
+	/* FIXME: My_Connetions/Pool_Size is needed by other parts of the
+	 * code; remove them! */
+	My_Connections = (CONNECTION*) array_start(&My_ConnArray);
+
+	LogDebug("Allocated connection pool for %d items (%ld bytes).",
+		array_length(&My_ConnArray, sizeof( CONNECTION )), array_bytes(&My_ConnArray));
 
-	/* Groesster File-Descriptor fuer select() */
-	Conn_MaxFD = 0;
+	assert( array_length(&My_ConnArray, sizeof( CONNECTION )) >= (size_t) Pool_Size);
+	
+	array_free( &My_Listeners );
 
 	/* Connection-Struktur initialisieren */
 	for( i = 0; i < Pool_Size; i++ ) Init_Conn_Struct( i );
@@ -251,9 +241,7 @@ Conn_Exit( void )
 
 	CONN_ID idx;
 
-#ifdef DEBUG
-	Log( LOG_DEBUG, "Shutting down all connections ..." );
-#endif
+	LogDebug("Shutting down all connections ..." );
 
 	Conn_ExitListeners();
 
@@ -262,35 +250,61 @@ Conn_Exit( void )
 		if( My_Connections[idx].sock > NONE ) {
 			Conn_Close( idx, NULL, NGIRCd_SignalRestart ?
 				"Server going down (restarting)":"Server going down", true );
-			continue;
 		}
 	}
 
-	free( My_Connections );
+	array_free(&My_ConnArray);
 	My_Connections = NULL;
 	Pool_Size = 0;
 	io_library_shutdown();
 } /* Conn_Exit */
 
 
-GLOBAL int
+static unsigned int
+ports_initlisteners(array *a, void (*func)(int,short))
+{
+	unsigned int created = 0;
+	size_t 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 unsigned int
 Conn_InitListeners( void )
 {
 	/* Initialize ports on which the server should accept connections */
 
-	int created, i;
+	unsigned int created;
 
 	if (!io_library_init(CONNECTION_POOL)) {
 		Log(LOG_EMERG, "Cannot initialize IO routines: %s", strerror(errno));
 		return -1;
 	}
 
-	created = 0;
-	for( i = 0; i < Conf_ListenPorts_Count; i++ )
-	{
-		if( Conn_NewListener( Conf_ListenPorts[i] )) created++;
-		else Log( LOG_ERR, "Can't listen on port %u!", (unsigned int) Conf_ListenPorts[i] );
-	}
+	created = ports_initlisteners(&Conf_ListenPorts, cb_listen);
+
 	return created;
 } /* Conn_InitListeners */
 
@@ -300,30 +314,28 @@ Conn_ExitListeners( void )
 {
 	/* Close down all listening sockets */
 	int *fd;
-	unsigned int arraylen;
+	size_t arraylen;
 #ifdef ZEROCONF
 	Rendezvous_UnregisterListeners( );
 #endif
 
 	arraylen = array_length(&My_Listeners, sizeof (int));
-	Log( LOG_INFO, "Shutting down all listening sockets (%d)...", arraylen );
+	Log( LOG_INFO, "Shutting down all listening sockets (%d total)...", arraylen );
+	fd = array_start(&My_Listeners);
 	while(arraylen--) {
-		fd = (int*) array_get(&My_Listeners, sizeof (int), arraylen);
-		if (fd) {
-			close(*fd);
-			Log( LOG_DEBUG, "Listening socket %d closed.", *fd );
-#ifdef DEBUG
-		} else {
-			Log( LOG_DEBUG, "array_get pos %d returned NULL", arraylen );
-#endif
-		}
+		assert(fd != NULL);
+		assert(*fd >= 0);
+		io_close(*fd);
+		LogDebug("Listening socket %d closed.", *fd );
+		fd++;
 	}
 	array_free(&My_Listeners);
 } /* Conn_ExitListeners */
 
 
-GLOBAL bool
-Conn_NewListener( const UINT16 Port )
+/* return new listening port file descriptor or -1 on failure */
+static int
+NewListener( const UINT16 Port )
 {
 	/* Create new listening socket on specified port */
 
@@ -337,7 +349,7 @@ Conn_NewListener( const UINT16 Port )
 	/* Server-"Listen"-Socket initialisieren */
 	memset( &addr, 0, sizeof( addr ));
 	memset( &inaddr, 0, sizeof( inaddr ));
-	addr.sin_family = AF_INET;
+	addr.sin_family = (sa_family_t)AF_INET;
 	addr.sin_port = htons( Port );
 	if( Conf_ListenAddress[0] )
 	{
@@ -348,46 +360,40 @@ Conn_NewListener( const UINT16 Port )
 		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;
+			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 )
-	{
+	if( sock < 0 ) {
 		Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
-		return false;
+		return -1;
 	}
 
-	if( ! Init_Socket( sock )) return false;
+	if( ! Init_Socket( sock )) return -1;
 
-	/* an Port binden */
-	if( bind( sock, (struct sockaddr *)&addr, (socklen_t)sizeof( addr )) != 0 )
-	{
-		Log( LOG_CRIT, "Can't bind socket: %s!", strerror( errno ));
+	if (bind(sock, (struct sockaddr *)&addr, (socklen_t)sizeof(addr)) != 0) {
+		Log( LOG_CRIT, "Can't bind socket (port %d) : %s!", Port, strerror( errno ));
 		close( sock );
-		return false;
+		return -1;
 	}
 
-	/* in "listen mode" gehen :-) */
-	if( listen( sock, 10 ) != 0 )
-	{
-		Log( LOG_CRIT, "Can't listen on soecket: %s!", strerror( errno ));
+	if( listen( sock, 10 ) != 0 ) {
+		Log( LOG_CRIT, "Can't listen on socket: %s!", strerror( errno ));
 		close( sock );
-		return false;
+		return -1;
 	}
 
-	/* Neuen Listener in Strukturen einfuegen */
+	/* keep fd in list so we can close it when ngircd restarts/shuts down */
 	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 false;
+		return -1;
 	}
-	io_event_create( sock, IO_WANTREAD, cb_listen ); 
 
 	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 );
@@ -413,39 +419,35 @@ Conn_NewListener( const UINT16 Port )
 	}
 
 	/* 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 ));
+	if (Port != 6667)
+		snprintf(name, sizeof name, "%s (port %u)", info,
+		 	 (unsigned int)Port);
+	else
+	 	strlcpy(name, info, sizeof name);
 
 	/* Register service */
 	Rendezvous_Register( name, MDNS_TYPE, Port );
 #endif
-	return true;
-} /* Conn_NewListener */
+	return sock;
+} /* NewListener */
 
 
 GLOBAL void
 Conn_Handler( void )
 {
-	/* "Hauptschleife": Aktive Verbindungen ueberwachen. Folgende Aktionen
-	 * werden dabei durchgefuehrt, bis der Server terminieren oder neu
-	 * starten soll:
-	 *
-	 *  - neue Verbindungen annehmen,
-	 *  - Server-Verbindungen aufbauen,
-	 *  - geschlossene Verbindungen loeschen,
-	 *  - volle Schreibpuffer versuchen zu schreiben,
-	 *  - volle Lesepuffer versuchen zu verarbeiten,
-	 *  - Antworten von Resolver Sub-Prozessen annehmen.
+	/* "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;
-	time_t start, t;
+	time_t t;
 	bool timeout;
 
-	start = time( NULL );
-	while(( ! NGIRCd_SignalQuit ) && ( ! NGIRCd_SignalRestart ))
-	{
+	while(( ! NGIRCd_SignalQuit ) && ( ! NGIRCd_SignalRestart )) {
 		timeout = true;
 
 #ifdef ZEROCONF
@@ -453,7 +455,9 @@ Conn_Handler( void )
 #endif
 
 		/* Should the configuration be reloaded? */
-		if( NGIRCd_SignalRehash ) NGIRCd_Rehash( );
+		if (NGIRCd_SignalRehash) {
+			NGIRCd_Rehash( );
+		}
 
 		/* Check configured servers and established links */
 		Check_Servers( );
@@ -462,8 +466,7 @@ Conn_Handler( void )
 		t = time( NULL );
 
 		/* noch volle Lese-Buffer suchen */
-		for( i = 0; i < Pool_Size; i++ )
-		{
+		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 ))
 			{
@@ -476,8 +479,8 @@ Conn_Handler( void )
 		for( i = 0; i < Pool_Size; i++ ) {
 			if ( My_Connections[i].sock <= NONE )
 				continue;
-			
-			wdatalen = array_bytes(&My_Connections[i].wbuf);
+
+			wdatalen = (unsigned int)array_bytes(&My_Connections[i].wbuf);
 
 #ifdef ZLIB
 			if (( wdatalen > 0 ) || ( array_bytes(&My_Connections[i].zip.wbuf)> 0 ))
@@ -488,7 +491,6 @@ Conn_Handler( void )
 				/* Socket der Verbindung in Set aufnehmen */
 				io_event_add( My_Connections[i].sock, IO_WANTWRITE );
 			}
-
 		}
 
 		/* von welchen Sockets koennte gelesen werden? */
@@ -496,7 +498,7 @@ Conn_Handler( void )
 			if ( My_Connections[i].sock <= NONE )
 				continue;
 
-			if ( My_Connections[i].res_stat ) {
+			if (Resolve_INPROGRESS(&My_Connections[i].res_stat)) {
 				/* wait for completion of Resolver Sub-Process */
 				io_event_del( My_Connections[i].sock, IO_WANTREAD );
 				continue;
@@ -513,12 +515,11 @@ Conn_Handler( void )
 			io_event_add( My_Connections[i].sock, IO_WANTREAD );
 		}
 
-		/* Timeout initialisieren */
+		/* (re-)set timeout - tv_sec/usec are undefined after io_dispatch() returns */
 		tv.tv_usec = 0;
-		if( timeout ) tv.tv_sec = 1;
-		else tv.tv_sec = 0;
+		tv.tv_sec = timeout ? 1 : 0;
 
-		/* Auf Aktivitaet warten */
+		/* wait for activity */
 		i = io_dispatch( &tv );
 		if (i == -1 && errno != EINTR ) {
 			Log(LOG_EMERG, "Conn_Handler(): io_dispatch(): %s!", strerror(errno));
@@ -553,6 +554,7 @@ va_dcl
 #endif
 {
 	char buffer[COMMAND_LEN];
+	size_t len;
 	bool ok;
 	va_list ap;
 
@@ -597,8 +599,8 @@ va_dcl
 		Log(LOG_DEBUG, " -> connection %d: '%s'.", Idx, buffer);
 #endif
 
-	strlcat( buffer, "\r\n", sizeof( buffer ));
-	ok = Conn_Write( Idx, buffer, strlen( buffer ));
+	len = strlcat( buffer, "\r\n", sizeof( buffer ));
+	ok = Conn_Write(Idx, buffer, len);
 	My_Connections[Idx].msg_out++;
 
 	va_end( ap );
@@ -606,39 +608,45 @@ va_dcl
 } /* Conn_WriteStr */
 
 
-GLOBAL bool
-Conn_Write( CONN_ID Idx, char *Data, unsigned int Len )
+/**
+ * Append Data to outbound write buf.
+ * @param Idx Index fo the connection.
+ * @param Data pointer to data
+ * @param Len length of Data
+ * @return true on success, false otherwise.
+ */
+static bool
+Conn_Write( CONN_ID Idx, char *Data, size_t Len )
 {
-	/* Daten in Socket schreiben. Bei "fatalen" Fehlern wird
-	 * der Client disconnectiert und false geliefert. */
-
+	CLIENT *c;
+	size_t writebuf_limit = WRITEBUFFER_LEN;
 	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 )
-	{
-#ifdef DEBUG
-		Log( LOG_DEBUG, "Skipped write on closed socket (connection %d).", Idx );
-#endif
+	c = Conn_GetClient(Idx);
+	assert( c != NULL);
+	if (Client_Type(c) == CLIENT_SERVER)
+		writebuf_limit = WRITEBUFFER_LEN * 10;
+	/* Is the socket still open? A previous call to Conn_Write()
+	 * may have closed the connection due to a fatal error.
+	 * In this case it is sufficient to return an error */
+	if( My_Connections[Idx].sock <= NONE ) {
+		LogDebug("Skipped write on closed socket (connection %d).", Idx );
 		return false;
 	}
 
-	/* 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 ... */
+	/* check if outbound buffer has enough space for data.
+	 * the idea is to keep data buffered  before sending, e.g. to improve
+	 * compression */
+	if (array_bytes(&My_Connections[Idx].wbuf) >= writebuf_limit) {
+		/* Buffer is full, flush. Handle_Write deals with low-level errors, if any. */
 		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 );
+		if (array_bytes(&My_Connections[Idx].wbuf) >= (writebuf_limit*2)) {
+			Log(LOG_NOTICE, "Write buffer overflow (connection %d, size %lu byte)!", Idx,
+					(unsigned long) array_bytes(&My_Connections[Idx].wbuf));
 			Conn_Close( Idx, "Write buffer overflow!", NULL, false );
 			return false;
 		}
@@ -646,13 +654,13 @@ Conn_Write( CONN_ID Idx, char *Data, unsigned int Len )
 
 #ifdef ZLIB
 	if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) {
-		/* Daten komprimieren und in Puffer kopieren */
+		/* compress and move data to write buffer */
 		if( ! Zip_Buffer( Idx, Data, Len )) return false;
 	}
 	else
 #endif
 	{
-		/* Daten in Puffer kopieren */
+		/* copy data to write buffer */
 		if (!array_catb( &My_Connections[Idx].wbuf, Data, Len ))
 			return false;
 
@@ -686,9 +694,7 @@ Conn_Close( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient )
 	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
+		LogDebug("Recursive request to close connection: %d", Idx );
 		return;
 	}
 
@@ -696,68 +702,102 @@ Conn_Close( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient )
 
 	/* Mark link as "closing" */
 	Conn_OPTION_ADD( &My_Connections[Idx], 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 ));
+	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 );
+	c = Conn_GetClient( Idx );
 
 	/* Should the client be informed? */
-	if( InformClient )
-	{
+	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_ThisServer( ), NOTICE_TXTPREFIX, (double)My_Connections[Idx].bytes_in / 1024,  (double)My_Connections[Idx].bytes_out / 1024 );
+		if ((c != NULL) && (Client_Type(c) == CLIENT_USER)) {
+			Conn_WriteStr( Idx,
+			 ":%s NOTICE %s :%sConnection statistics: client %.1f kb, server %.1f kb.",
+			 Client_ID(Client_ThisServer()), Client_ID(c),
+			 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 (FwdMsg)
+			Conn_WriteStr(Idx, "ERROR :%s", FwdMsg);
+		else
+			Conn_WriteStr(Idx, "ERROR :Closing connection.");
 	}
 
-	/* Try to write out the write buffer */
+	/* Try to write out the write buffer. Note: Handle_Write() eventually
+	 * removes the CLIENT structure associated with this connection if an
+	 * error occurs! So we have to re-check if there is still an valid
+	 * CLIENT structure after calling Handle_Write() ...*/
 	(void)Handle_Write( Idx );
-	
+
+	/* Search client, if any (re-check!) */
+	c = Conn_GetClient( Idx );
+
 	/* Shut down socket */
-	if( ! io_close( My_Connections[Idx].sock ))
-	{
+	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 ));
+		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 );
+	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 )) {
+	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;
+		/* Make sure that no division by zero can occur during
+		 * the calculation of in_p and out_p: in_z_k and out_z_k
+		 * are non-zero, that's guaranteed by the protocol until
+		 * compression can be enabled. */
+		if (! in_z_k)
+			in_z_k = in_k;
+		if (! out_z_k)
+			out_z_k = out_k;
 		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 );
+		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
 #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 );
+		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] );
+	/* cancel running resolver */
+	if (Resolve_INPROGRESS(&My_Connections[Idx].res_stat))
+		Resolve_Shutdown(&My_Connections[Idx].res_stat);
 
 	/* Servers: Modify time of next connect attempt? */
 	Conf_UnsetServer( Idx );
@@ -774,12 +814,11 @@ Conn_Close( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient )
 
 	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
+	LogDebug("Shutdown of connection %d completed.", Idx );
 } /* Conn_Close */
 
 
@@ -793,13 +832,13 @@ Conn_SyncServerStruct( void )
 	CONN_ID i;
 	int c;
 
-	for( i = 0; i < Pool_Size; i++ )
-	{
+	for( i = 0; i < Pool_Size; i++ ) {
 		/* Established connection? */
-		if( My_Connections[i].sock <= NONE ) continue;
+		if (My_Connections[i].sock < 0)
+			continue;
 
 		/* Server connection? */
-		client = Client_GetFromConn( i );
+		client = Conn_GetClient( i );
 		if(( ! client ) || ( Client_Type( client ) != CLIENT_SERVER )) continue;
 
 		for( c = 0; c < MAX_SERVERS; c++ )
@@ -808,65 +847,75 @@ Conn_SyncServerStruct( void )
 			if( ! Conf_Server[c].host[0] ) continue;
 
 			/* Duplicate? */
-			if( strcmp( Conf_Server[c].name, Client_ID( client )) == 0 ) Conf_Server[c].conn_id = i;
+			if( strcmp( Conf_Server[c].name, Client_ID( client )) == 0 )
+				Conf_Server[c].conn_id = i;
 		}
 	}
 } /* SyncServerStruct */
 
 
-LOCAL bool
+/**
+ * Send out data of write buffer; connect new sockets.
+ */
+static bool
 Handle_Write( CONN_ID Idx )
 {
-	/* Daten aus Schreibpuffer versenden bzw. Connection aufbauen */
-
-	int len;
-	unsigned int wdatalen;
+	ssize_t len;
+	size_t 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);
+		LogDebug("Handle_Write() on closed socket, connection %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))) {
+	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 );
+	/* write buffer empty, but not compression buffer?
+         * -> flush compression buffer! */
+	if (wdatalen == 0)
+		Zip_Flush(Idx);
 #else
-	if( wdatalen == 0 ) {
+	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 );
+	/* Zip_Flush() may have changed the write buffer ... */
+	wdatalen = array_bytes(&My_Connections[Idx].wbuf);
+	LogDebug
+	    ("Handle_Write() called for connection %d, %ld bytes pending ...",
+	     Idx, wdatalen);
+
+	len = write(My_Connections[Idx].sock,
+	            array_start(&My_Connections[Idx].wbuf), wdatalen );
+
 	if( len < 0 ) {
-		if( errno == EAGAIN || errno == EINTR)
+		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 );
+		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);
+	array_moveleft(&My_Connections[Idx].wbuf, 1, (size_t)len);
 
 	return true;
 } /* Handle_Write */
 
 
-LOCAL void
+static int
 New_Connection( int Sock )
 {
 	/* Neue Client-Verbindung von Listen-Socket annehmen und
@@ -876,21 +925,18 @@ New_Connection( int Sock )
 	struct request_info req;
 #endif
 	struct sockaddr_in new_addr;
-	int new_sock, new_sock_len;
-	RES_STAT *s;
-	CONN_ID idx;
+	int new_sock, new_sock_len, new_Pool_Size;
 	CLIENT *c;
-	POINTER *ptr;
-	long new_size, cnt;
+	long 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;
+	new_sock_len = (int)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 -1;
 	}
 
 #ifdef TCPWRAP
@@ -903,12 +949,13 @@ New_Connection( int Sock )
 		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 );
+	if (!Init_Socket( new_sock ))
+		return -1;
 	
 	/* Check IP-based connection limit */
 	cnt = Count_Connections( new_addr );
@@ -918,155 +965,115 @@ New_Connection( int Sock )
 		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;
+		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;
-			}
-			if( new_size > Conf_MaxConnections ) new_size = Conf_MaxConnections;
-		}
-		if( new_size < Pool_Size )
+	if( new_sock >= Pool_Size ) {
+		new_Pool_Size = new_sock + 1;
+		/* No free Connection Structures, check if we may accept further connections */
+		if ((( Conf_MaxConnections > 0) && Pool_Size >= Conf_MaxConnections) ||
+			(new_Pool_Size < Pool_Size))
 		{
-			Log( LOG_ALERT, "Can't accept connection: limit (%d) reached -- overflow!", Pool_Size );
+			Log( LOG_ALERT, "Can't accept connection: limit (%d) reached!", Pool_Size );
 			Simple_Message( new_sock, "ERROR :Connection limit reached" );
 			close( new_sock );
-			return;
+			return -1;
 		}
 
-		ptr = (POINTER *)realloc( My_Connections, sizeof( CONNECTION ) * new_size );
-		if( ! ptr )
-		{
+		if (!array_alloc(&My_ConnArray, sizeof(CONNECTION),
+				 (size_t)new_sock)) {
 			Log( LOG_EMERG, "Can't allocate memory! [New_Connection]" );
 			Simple_Message( new_sock, "ERROR: Internal error" );
 			close( new_sock );
-			return;
+			return -1;
 		}
-
-#ifdef DEBUG
-		Log( LOG_DEBUG, "Allocated new connection pool for %ld items (%ld bytes). [realloc()]", new_size, sizeof( CONNECTION ) * new_size );
-#endif
+		LogDebug("Bumped connection pool to %ld items (internal: %ld items, %ld bytes)",
+			new_sock, array_length(&My_ConnArray, sizeof(CONNECTION)), array_bytes(&My_ConnArray));
 
 		/* 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;
+		My_Connections = array_start(&My_ConnArray);
+		while (Pool_Size < new_Pool_Size)
+			Init_Conn_Struct(Pool_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;
+	/* register callback */
+	if (!io_event_create( new_sock, IO_WANTREAD, cb_clientserver)) {
+		Log(LOG_ALERT, "Can't accept connection: io_event_create failed!");
+		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;
+	c = Client_NewLocal( new_sock, 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");
+		io_close(new_sock);
+		return -1;
+	}
 
-	/* Neuen Socket registrieren */
-	io_event_create( new_sock, IO_WANTREAD, cb_clientserver);
+	Init_Conn_Struct( new_sock );
+	My_Connections[new_sock].sock = new_sock;
+	My_Connections[new_sock].addr = new_addr;
+	My_Connections[new_sock].client = c;
 
-	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 );
+	Log( LOG_INFO, "Accepted connection %d from %s:%d on socket %d.", new_sock,
+			inet_ntoa( new_addr.sin_addr ), ntohs( new_addr.sin_port), 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
-	/* resolver process has been started */
-	if( s ) My_Connections[idx].res_stat = s;
+	strlcpy( My_Connections[new_sock].host, inet_ntoa( new_addr.sin_addr ),
+						sizeof( My_Connections[new_sock].host ));
+
+	Client_SetHostname( c, My_Connections[new_sock].host );
+
+	Resolve_Addr(&My_Connections[new_sock].res_stat, &new_addr,
+		My_Connections[new_sock].sock, cb_Read_Resolver_Result);
 
 	/* Penalty-Zeit setzen */
-	Conn_SetPenalty( idx, 4 );
+	Conn_SetPenalty( new_sock, 4 );
+	return new_sock;
 } /* New_Connection */
 
 
-LOCAL CONN_ID
+static CONN_ID
 Socket2Index( int Sock )
 {
 	/* zum Socket passende Connection suchen */
 
-	CONN_ID idx;
-
-	assert( Sock > NONE );
+	assert( Sock >= 0 );
 
-	for( idx = 0; idx < Pool_Size; idx++ ) if( My_Connections[idx].sock == Sock ) break;
-
-	if( idx >= Pool_Size )
-	{
+	if( Sock >= Pool_Size || My_Connections[Sock].sock != 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
+		LogDebug("Socket2Index: can't get connection for socket %d!", Sock);
 		return NONE;
 	}
-	else return idx;
+	return Sock;
 } /* Socket2Index */
 
 
-LOCAL void
+static void
 Read_Request( CONN_ID Idx )
 {
 	/* Daten von Socket einlesen und entsprechend behandeln.
 	 * Tritt ein Fehler auf, so wird der Socket geschlossen. */
 
-	unsigned int bsize;
-	int len;
-	char readbuf[1024];
-#ifdef ZLIB
+	size_t readbuf_limit = READBUFFER_LEN;
+	ssize_t len;
+	char readbuf[READBUFFER_LEN];
 	CLIENT *c;
-#endif
-
 	assert( Idx > NONE );
 	assert( My_Connections[Idx].sock > NONE );
 
-	/* wenn noch nicht registriert: maximal mit ZREADBUFFER_LEN arbeiten,
-	 * ansonsten koennen Daten ggf. nicht umkopiert werden. */
-	bsize = READBUFFER_LEN;
+	c = Conn_GetClient(Idx);
+	assert ( c != NULL);
+	if (Client_Type(c) == CLIENT_SERVER)
+		readbuf_limit = READBUFFER_LEN * 10;
 #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 ZLIB
-	if (( array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN ) ||
-		( array_bytes(&My_Connections[Idx].zip.rbuf) >= ZREADBUFFER_LEN ))
+	if ((array_bytes(&My_Connections[Idx].rbuf) >= readbuf_limit) ||
+		(array_bytes(&My_Connections[Idx].zip.rbuf) >= readbuf_limit))
 #else
-	if ( array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN )
+	if (array_bytes(&My_Connections[Idx].rbuf) >= readbuf_limit)
 #endif
 	{
 		/* Der Lesepuffer ist voll */
@@ -1076,14 +1083,15 @@ Read_Request( CONN_ID Idx )
 		return;
 	}
 
-	len = read( My_Connections[Idx].sock, readbuf, sizeof readbuf );
+	len = read(My_Connections[Idx].sock, readbuf, sizeof(readbuf));
 	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 ));
+			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,
@@ -1092,33 +1100,47 @@ Read_Request( CONN_ID Idx )
 		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 );
+	if (Conn_OPTION_ISSET(&My_Connections[Idx], CONN_ZIP)) {
+		if (!array_catb(&My_Connections[Idx].zip.rbuf, readbuf,
+				(size_t) 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 )) {
+		if (!array_catb( &My_Connections[Idx].rbuf, readbuf, len)) {
 			Log( LOG_ERR, "Could not append recieved data to input buffer (connn %d): %d bytes!", Idx, len );
 			Conn_Close( Idx, "Receive buffer overflow!", NULL, false );
 		}
 	}
 
-	/* Connection-Statistik aktualisieren */
+	/* Update connection statistics */
 	My_Connections[Idx].bytes_in += len;
 
-	/* Timestamp aktualisieren */
-	My_Connections[Idx].lastdata = time( NULL );
+	/* Update timestamp of last data received if this connection is
+	 * registered as a user, server or service connection. Don't update
+	 * otherwise, so users have at least Conf_PongTimeout seconds time to
+	 * register with the IRC server -- see Check_Connections().
+	 * Set "lastping", too, so we can handle time shifts backwards ... */
+	c = Conn_GetClient(Idx);
+	if (c && (Client_Type(c) == CLIENT_USER
+		  || Client_Type(c) == CLIENT_SERVER
+		  || Client_Type(c) == CLIENT_SERVICE)) {
+		My_Connections[Idx].lastdata = time(NULL);
+		My_Connections[Idx].lastping = My_Connections[Idx].lastdata;
+	}
 
-	Handle_Buffer( Idx );
+	/* Look at the data in the (read-) buffer of this connection */
+	Handle_Buffer(Idx);
 } /* Read_Request */
 
 
-LOCAL bool
+static bool
 Handle_Buffer( CONN_ID Idx )
 {
 	/* Handle Data in Connections Read-Buffer.
@@ -1127,34 +1149,30 @@ Handle_Buffer( CONN_ID Idx )
 	char *ptr1, *ptr2;
 #endif
 	char *ptr;
-	int len, delta;
-	unsigned int arraylen;
-	bool action, result;
+	size_t len, delta;
+	bool result;
+	time_t starttime;
 #ifdef ZLIB
 	bool old_z;
 #endif
 
+	starttime = time(NULL);
 	result = false;
-	do
-	{
+	for (;;) {
 		/* Check penalty */
-		if( My_Connections[Idx].delaytime > time( NULL )) return result;
+		if( My_Connections[Idx].delaytime > starttime) return result;
 #ifdef ZLIB
 		/* unpack compressed data */
 		if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP ))
 			if( ! Unzip_Buffer( Idx )) return false;
 #endif
 
-		arraylen = array_bytes(&My_Connections[Idx].rbuf);
-		if (arraylen == 0)
+		if (0 == array_bytes(&My_Connections[Idx].rbuf))
 			break;
 
-		if (!array_cat0(&My_Connections[Idx].rbuf)) /* make sure buf is NULL terminated */
+		if (!array_cat0_temporary(&My_Connections[Idx].rbuf)) /* make sure buf is NULL terminated */
 			return false;
 
-		array_truncate(&My_Connections[Idx].rbuf, 1, arraylen); /* do not count trailing NULL */
-
-
 		/* A Complete Request end with CR+LF, see RFC 2812. */
 		ptr = strstr( array_start(&My_Connections[Idx].rbuf), "\r\n" );
 
@@ -1172,7 +1190,6 @@ Handle_Buffer( CONN_ID Idx )
 		}
 #endif
 
-		action = false;
 		if( ! ptr )
 			break;
 
@@ -1181,7 +1198,7 @@ Handle_Buffer( CONN_ID Idx )
 
 		len = ( ptr - (char*) array_start(&My_Connections[Idx].rbuf)) + delta;
 
-		if( len < 0 || len > ( COMMAND_LEN - 1 )) {
+		if( 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)!",
@@ -1190,177 +1207,140 @@ Handle_Buffer( CONN_ID Idx )
 			return false;
 		}
 
+		if (len <= 2) { /* request was empty (only '\r\n') */
+			array_moveleft(&My_Connections[Idx].rbuf, 1, delta); /* delta is either 1 or 2 */
+			break;
+		}
 #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
-		}
+		My_Connections[Idx].msg_in++;
+		if (!Parse_Request(Idx, (char*)array_start(&My_Connections[Idx].rbuf) ))
+			return false;
 
+		result = true;
+
+		array_moveleft(&My_Connections[Idx].rbuf, 1, len);
+		LogDebug("Connection %d: %d bytes left in read buffer.",
+		    Idx, array_bytes(&My_Connections[Idx].rbuf));
 #ifdef ZLIB
-		if(( ! old_z ) && ( My_Connections[Idx].options & CONN_ZIP ) && ( array_bytes(&My_Connections[Idx].rbuf) > 0 ))
+		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 */
+			LogDebug("Moved already received data (%u bytes) to uncompression buffer.",
+								array_bytes(&My_Connections[Idx].zip.rbuf));
 		}
 #endif /* ZLIB */
-		if( action ) result = true;
-	} while( action );
-
+	}
 	return result;
 } /* Handle_Buffer */
 
 
-LOCAL void
-Check_Connections( void )
+static void
+Check_Connections(void)
 {
-	/* Pruefen, ob Verbindungen noch "alive" sind. Ist dies
-	 * nicht der Fall, zunaechst PING-PONG spielen und, wenn
-	 * auch das nicht "hilft", Client disconnectieren. */
-
+	/* 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;
+	for (i = 0; i < Pool_Size; i++) {
+		if (My_Connections[i].sock < 0)
+			continue;
 
-		c = Client_GetFromConn( i );
-		if( c && (( Client_Type( c ) == CLIENT_USER ) || ( Client_Type( c ) == CLIENT_SERVER ) || ( Client_Type( c ) == CLIENT_SERVICE )))
-		{
-			/* verbundener User, Server oder Service */
-			if( My_Connections[i].lastping > My_Connections[i].lastdata )
-			{
-				/* es wurde bereits ein PING gesendet */
-				if( My_Connections[i].lastping < time( NULL ) - Conf_PongTimeout )
-				{
+		c = Conn_GetClient(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 );
+					LogDebug
+					    ("Connection %d: Ping timeout: %d seconds.",
+					     i, Conf_PongTimeout);
+					Conn_Close(i, NULL, "Ping timeout",
+						   true);
 				}
+			} else if (My_Connections[i].lastdata <
+				   time(NULL) - Conf_PingTimeout) {
+				/* We need to send a PING ... */
+				LogDebug("Connection %d: sending PING ...", i);
+				My_Connections[i].lastping = time(NULL);
+				Conn_WriteStr(i, "PING :%s",
+					      Client_ID(Client_ThisServer()));
 			}
-			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( )));
-			}
-		}
-		else
-		{
-			/* noch nicht vollstaendig aufgebaute Verbindung */
-			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 );
+		} else {
+			/* The connection is not fully established yet, so
+			 * we don't do the PING-PONG game here but instead
+			 * disconnect the client after "a short time" if it's
+			 * still not registered. */
+
+			if (My_Connections[i].lastdata <
+			    time(NULL) - Conf_PongTimeout) {
+				LogDebug
+				    ("Unregistered connection %d timed out ...",
+				     i);
+				Conn_Close(i, NULL, "Timeout", false);
 			}
 		}
 	}
 } /* Check_Connections */
 
 
-LOCAL void
+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 );
-	}
+	time_t time_now;
 
 	/* Check all configured servers */
-	for( i = 0; i < MAX_SERVERS; i++ )
-	{
+	for( i = 0; i < MAX_SERVERS; i++ ) {
 		/* 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;
+		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( 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;
+			if (n < MAX_SERVERS) continue;
 		}
 
 		/* Check last connect attempt? */
-		if( Conf_Server[i].lasttry > time( NULL ) - Conf_ConnectRetry ) continue;
+		time_now = time(NULL);
+		if( Conf_Server[i].lasttry > (time_now - 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;
+		Conf_Server[i].lasttry = time_now;
+		assert(Resolve_Getfd(&Conf_Server[i].res_stat) < 0);
+		Resolve_Name(&Conf_Server[i].res_stat, Conf_Server[i].host, cb_Connect_to_Server);
 	}
 } /* Check_Servers */
 
 
-LOCAL void
-New_Server( int Server, CONN_ID Idx )
+static void
+New_Server( int Server )
 {
 	/* Establish new server link */
 
@@ -1370,19 +1350,9 @@ New_Server( int Server, CONN_ID Idx )
 	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: */
-		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;
-	}
 
-	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 );
+	Log( LOG_INFO, "Establishing connection to \"%s\", %s, port %d ... ", Conf_Server[Server].host,
+							Conf_Server[Server].ip, Conf_Server[Server].port );
 
 #ifdef HAVE_INET_ATON
 	if( inet_aton( Conf_Server[Server].ip, &inaddr ) == 0 )
@@ -1392,84 +1362,93 @@ New_Server( int Server, CONN_ID Idx )
 	if( inaddr.s_addr == (unsigned)-1 )
 #endif
 	{
-		/* 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 );
+		Log( LOG_ERR, "Can't connect to \"%s\": can't convert ip address %s!",
+				Conf_Server[Server].host, Conf_Server[Server].ip );
 		return;
 	}
 
 	memset( &new_addr, 0, sizeof( new_addr ));
-	new_addr.sin_family = AF_INET;
+	new_addr.sin_family = (sa_family_t)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 */
-		Init_Conn_Struct( Idx );
-		Conf_Server[Server].conn_id = NONE;
+	if ( new_sock < 0 ) {
 		Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
 		return;
 	}
 
 	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 */
+	res = connect(new_sock, (struct sockaddr *)&new_addr,
+			(socklen_t)sizeof(new_addr));
+	if(( res != 0 ) && ( errno != EINPROGRESS )) {
 		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 );
-	if( ! c )
-	{
-		/* Can't create new client structure */
+	
+	if (!array_alloc(&My_ConnArray, sizeof(CONNECTION), (size_t)new_sock)) {
+		Log(LOG_ALERT,
+		    "Cannot allocate memory for server connection (socket %d)",
+		    new_sock);
 		close( new_sock );
-		Init_Conn_Struct( Idx );
-		Conf_Server[Server].conn_id = NONE;
+		return;
+	}
+
+	My_Connections = array_start(&My_ConnArray);
+
+	assert(My_Connections[new_sock].sock <= 0);
+
+	Init_Conn_Struct(new_sock);
+
+	c = Client_NewLocal( new_sock, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWNSERVER, false );
+	if( ! c ) {
 		Log( LOG_ALERT, "Can't establish connection: can't create client structure!" );
+		close( new_sock );
 		return;
 	}
+
 	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 ));
+	Conf_Server[Server].conn_id = new_sock;
+	My_Connections[new_sock].sock = new_sock;
+	My_Connections[new_sock].addr = new_addr;
+	My_Connections[new_sock].client = c;
+	strlcpy( My_Connections[new_sock].host, Conf_Server[Server].host,
+				sizeof(My_Connections[new_sock].host ));
 
 	/* Register new socket */
-	io_event_create( new_sock, IO_WANTWRITE, cb_connserver);
-	Conn_OPTION_ADD( &My_Connections[Idx], CONN_ISCONNECTING );
+	if (!io_event_create( new_sock, IO_WANTWRITE, cb_connserver)) {
+		Log( LOG_ALERT, "io_event_create(): could not add fd %d", strerror(errno));
+		Conn_Close( new_sock, "io_event_create() failed", NULL, false );
+		Init_Conn_Struct( new_sock );
+		Conf_Server[Server].conn_id = NONE;
+	}
 
-#ifdef DEBUG
-	Log( LOG_DEBUG, "Registered new connection %d on socket %d.", Idx, My_Connections[Idx].sock );
-#endif
+	LogDebug("Registered new connection %d on socket %d.",
+				new_sock, My_Connections[new_sock].sock );
+	Conn_OPTION_ADD( &My_Connections[new_sock], CONN_ISCONNECTING );
 } /* New_Server */
 
 
-LOCAL void
+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;
+	My_Connections[Idx].sock = -1;
 	My_Connections[Idx].lastdata = now;
 	My_Connections[Idx].lastprivmsg = now;
+	Resolve_Init(&My_Connections[Idx].res_stat);
 } /* Init_Conn_Struct */
 
 
-LOCAL bool
+static bool
 Init_Socket( int Sock )
 {
 	/* Initialize socket (set options) */
@@ -1493,9 +1472,7 @@ Init_Socket( int Sock )
 	/* 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
+	LogDebug("Setting option IP_TOS on socket %d to IPTOS_LOWDELAY (%d).", Sock, value );
 	if( setsockopt( Sock, SOL_IP, IP_TOS, &value, (socklen_t)sizeof( value )) != 0 )
 	{
 		Log( LOG_ERR, "Can't set socket option IP_TOS: %s!", strerror( errno ));
@@ -1507,137 +1484,126 @@ Init_Socket( int Sock )
 } /* Init_Socket */
 
 
-GLOBAL
-void Read_Resolver_Result( int r_fd )
+
+static void
+cb_Connect_to_Server(int fd, UNUSED short events)
+{
+	/* Read result of resolver sub-process from pipe and start connection */
+	int i;
+	size_t len;
+	char readbuf[HOST_LEN + 1];
+
+	LogDebug("Resolver: Got forward lookup callback on fd %d, events %d", fd, events);
+
+	for (i=0; i < MAX_SERVERS; i++) {
+		  if (Resolve_Getfd(&Conf_Server[i].res_stat) == fd )
+			  break;
+	}
+	
+	if( i >= MAX_SERVERS) {
+		/* Ops, no matching server found?! */
+		io_close( fd );
+		LogDebug("Resolver: Got Forward Lookup callback for unknown server!?");
+		return;
+	}
+
+	/* Read result from pipe */
+	len = Resolve_Read(&Conf_Server[i].res_stat, readbuf, sizeof readbuf -1);
+	if (len == 0)
+		return;
+	
+	readbuf[len] = '\0';
+	LogDebug("Got result from resolver: \"%s\" (%u bytes read).", readbuf, len);
+	strlcpy( Conf_Server[i].ip, readbuf, sizeof( Conf_Server[i].ip ));
+
+	/* connect() */
+	New_Server(i);
+} /* cb_Read_Forward_Lookup */
+
+
+static void
+cb_Read_Resolver_Result( int r_fd, UNUSED short events )
 {
 	/* 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 len, i, n;
-	RES_STAT *s;
-	char *ptr;
+	int i;
+	size_t len;
+	char *identptr;
+#ifdef IDENTAUTH
+	char readbuf[HOST_LEN + 2 + CLIENT_USER_LEN];
+#else
+	char readbuf[HOST_LEN + 1];
+#endif
+
+	LogDebug("Resolver: Got callback on fd %d, events %d", r_fd, events );
 
-	Log( LOG_DEBUG, "Resolver: started, fd %d\n", r_fd );
 	/* Search associated connection ... */
-	for( i = 0; i < Pool_Size; i++ )
-	{
+	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 ))
+		  && ( Resolve_Getfd(&My_Connections[i].res_stat) == r_fd ))
 			break;
 	}
-	if( i >= Pool_Size )
-	{
+	if( i >= Pool_Size ) {
 		/* 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
+		LogDebug("Resolver: Got callback for unknown connection!?");
 		return;
 	}
 
-	/* 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! */
-		Log( LOG_CRIT, "Resolver: Can't read result: %s!", strerror( errno ));
-		FreeRes_stat( &My_Connections[i] );
+	len = Resolve_Read(&My_Connections[i].res_stat, readbuf, sizeof readbuf -1);
+	if (len == 0)
 		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
+	readbuf[len] = '\0';
+	identptr = strchr(readbuf, '\n');
+	assert(identptr != NULL);
+	if (!identptr) {
+		Log( LOG_CRIT, "Resolver: Got malformed result!");
+		return;
+	}
 
+	*identptr = '\0';
+	LogDebug("Got result from resolver: \"%s\" (%u bytes read).", readbuf, len);
 	/* 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
+	 * connections and a host name and 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 );
+	assert ( My_Connections[i].sock >= 0 );
+	/* Incoming connection. Search client ... */
+	c = Conn_GetClient( i );
+	assert( c != NULL );
 
-		/* Only update client information of unregistered clients */
-		if( Client_Type( c ) == CLIENT_UNKNOWN )
-		{
-			switch(s->stage) {
-				case 0: /* host name */
-				strlcpy( My_Connections[i].host, s->buffer, sizeof( My_Connections[i].host ));
-				Client_SetHostname( c, s->buffer );
+	/* Only update client information of unregistered clients */
+	if( Client_Type( c ) == CLIENT_UNKNOWN ) {
+		strlcpy(My_Connections[i].host, readbuf, sizeof( My_Connections[i].host));
+		Client_SetHostname( c, readbuf);
 #ifdef IDENTAUTH
-				/* clean up buffer for IDENT result */
-				len = strlen( s->buffer ) + 1;
-				assert((size_t) len <= sizeof( s->buffer ));
-				memmove( s->buffer, s->buffer + len, sizeof( s->buffer ) - len );
-				assert(len <= s->bufpos );
-				s->bufpos -= 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( 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
-				break;
-				default:
-				Log( LOG_ERR, "Resolver: got result for unknown stage %d!?", s->stage );
-			}
+		++identptr;
+		if (*identptr) {
+			Log( LOG_INFO, "IDENT lookup for connection %ld: \"%s\".", i, identptr);
+			Client_SetUser( c, identptr, true );
+		} else {
+			Log( LOG_INFO, "IDENT lookup for connection %ld: no result.", i );
 		}
+#endif
+	}
 #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 );
-
-		strlcpy( Conf_Server[n].ip, s->buffer, sizeof( Conf_Server[n].ip ));
-	}
-
-	/* Clean up ... */
-	FreeRes_stat( &My_Connections[i] );
-
 	/* Reset penalty time */
 	Conn_ResetPenalty( i );
-} /* Read_Resolver_Result */
+} /* cb_Read_Resolver_Result */
 
 
-LOCAL void
-Simple_Message( int Sock, char *Msg )
+static void
+Simple_Message( int Sock, const char *Msg )
 {
 	char buf[COMMAND_LEN];
+	size_t len;
 	/* Write "simple" message to socket, without using compression
 	 * or even the connection write buffers. Used e.g. for error
 	 * messages by New_Connection(). */
@@ -1645,24 +1611,38 @@ Simple_Message( int Sock, char *Msg )
 	assert( Msg != NULL );
 
 	strlcpy( buf, Msg, sizeof buf - 2);
-	strlcat( buf, "\r\n", sizeof buf);
-	(void)write( Sock, buf, strlen( buf ) );
+	len = strlcat( buf, "\r\n", sizeof buf);
+	(void)write(Sock, buf, len);
 } /* Simple_Error */
 
 
-LOCAL int
+static int
 Count_Connections( struct sockaddr_in addr_in )
 {
 	int i, cnt;
 	
 	cnt = 0;
-	for( i = 0; i < Pool_Size; i++ )
-	{
+	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 */
 
 
+GLOBAL CLIENT *
+Conn_GetClient( CONN_ID Idx ) 
+{
+	/* return Client-Structure that belongs to the local Connection Idx.
+	 * If none is found, return NULL.
+	 */
+	CONNECTION *c;
+	assert( Idx >= 0 );
+
+	c = array_get(&My_ConnArray, sizeof (CONNECTION), (size_t)Idx);
+
+	assert(c != NULL);
+
+	return c ? c->client : NULL;
+}
 
 /* -eof- */