X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconn.c;h=7be5d0a18e8026dd44375fe23644643df16f047f;hp=4ff38ceec5e2e5b37d5442922e79ffcfeb1afbed;hb=e9f3e69f36ca64f8945677bc72ccb7bbb57842e1;hpb=e50d04907485e027afc466059f02a58ef1c586ac

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 4ff38cee..7be5d0a1 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.159 2005/07/09 21:35:20 fw Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.182 2005/09/24 02:20:00 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -82,18 +82,19 @@ static char UNUSED id[] = "$Id: conn.c,v 1.159 2005/07/09 21:35:20 fw 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 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;
 
@@ -102,7 +103,9 @@ 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_clientserver PARAMS((int sock, short what));
 
 static void
@@ -114,7 +117,7 @@ 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;
@@ -157,7 +160,13 @@ cb_connserver(int sock, short what)
 	}
 
 	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 );
 
@@ -190,21 +199,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 )
 {
@@ -273,24 +267,50 @@ Conn_Exit( void )
 } /* Conn_Exit */
 
 
+static unsigned int
+ports_initlisteners(array *a, void (*func)(int,short))
+{
+	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 */
 
-	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 +320,30 @@ 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);
+		assert(fd);
+		assert(*fd >= 0);
+		io_close(*fd);
 #ifdef DEBUG
-			Log( LOG_DEBUG, "Listening socket %d closed.", *fd );
-		} else {
-			Log( LOG_DEBUG, "array_get pos %d returned NULL", arraylen );
+		Log( LOG_DEBUG, "Listening socket %d closed.", *fd );
 #endif
-		}
+		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 */
 
@@ -349,7 +369,7 @@ Conn_NewListener( const UINT16 Port )
 #endif
 		{
 			Log( LOG_CRIT, "Can't listen on %s:%u: can't convert ip address %s!", Conf_ListenAddress, Port, Conf_ListenAddress );
-			return false;
+			return -1;
 		}
 	}
 	else inaddr.s_addr = htonl( INADDR_ANY );
@@ -360,17 +380,17 @@ Conn_NewListener( const UINT16 Port )
 	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 ));
 		close( sock );
-		return false;
+		return -1;
 	}
 
 	/* in "listen mode" gehen :-) */
@@ -378,16 +398,15 @@ Conn_NewListener( const UINT16 Port )
 	{
 		Log( LOG_CRIT, "Can't listen on soecket: %s!", strerror( errno ));
 		close( sock );
-		return false;
+		return -1;
 	}
 
 	/* Neuen Listener in Strukturen einfuegen */
 	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 );
@@ -419,23 +438,18 @@ Conn_NewListener( const UINT16 Port )
 	/* 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;
@@ -476,7 +490,7 @@ Conn_Handler( void )
 		for( i = 0; i < Pool_Size; i++ ) {
 			if ( My_Connections[i].sock <= NONE )
 				continue;
-			
+
 			wdatalen = array_bytes(&My_Connections[i].wbuf);
 
 #ifdef ZLIB
@@ -495,7 +509,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;
@@ -706,24 +720,29 @@ Conn_Close( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient )
 	c = Client_GetFromConn( 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 */
 	(void)Handle_Write( Idx );
-	
+
 	/* Shut down socket */
 	if( ! io_close( My_Connections[Idx].sock ))
 	{
@@ -754,9 +773,10 @@ Conn_Close( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient )
 		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 );
@@ -813,7 +833,7 @@ Conn_SyncServerStruct( void )
 } /* SyncServerStruct */
 
 
-LOCAL bool
+static bool
 Handle_Write( CONN_ID Idx )
 {
 	/* Daten aus Schreibpuffer versenden bzw. Connection aufbauen */
@@ -821,40 +841,51 @@ Handle_Write( CONN_ID Idx )
 	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);
+#ifdef DEBUG
+		Log(LOG_DEBUG,
+		    "Handle_Write() on closed socket, connection %d", Idx);
+#endif
 		return false;
 	}
 	assert( My_Connections[Idx].sock > NONE );
 
+#ifdef DEBUG
+	Log(LOG_DEBUG, "Handle_Write() called for connection %d ...", Idx);
+#endif
 
 	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);
+
+	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;
 	}
 
@@ -865,7 +896,7 @@ Handle_Write( CONN_ID Idx )
 } /* Handle_Write */
 
 
-LOCAL void
+static int
 New_Connection( int Sock )
 {
 	/* Neue Client-Verbindung von Listen-Socket annehmen und
@@ -876,7 +907,6 @@ New_Connection( int Sock )
 #endif
 	struct sockaddr_in new_addr;
 	int new_sock, new_sock_len;
-	RES_STAT *s;
 	CONN_ID idx;
 	CLIENT *c;
 	POINTER *ptr;
@@ -889,7 +919,7 @@ New_Connection( int Sock )
 	if( new_sock < 0 )
 	{
 		Log( LOG_CRIT, "Can't accept connection: %s!", strerror( errno ));
-		return;
+		return -1;
 	}
 
 #ifdef TCPWRAP
@@ -902,7 +932,7 @@ 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
 
@@ -917,7 +947,7 @@ 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 */
@@ -938,7 +968,7 @@ New_Connection( int Sock )
 				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;
 			}
 			if( new_size > Conf_MaxConnections ) new_size = Conf_MaxConnections;
 		}
@@ -947,16 +977,15 @@ New_Connection( int Sock )
 			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;
+			return -1;
 		}
 
 		ptr = (POINTER *)realloc( My_Connections, sizeof( CONNECTION ) * new_size );
-		if( ! ptr )
-		{
+		if( ! ptr ) {
 			Log( LOG_EMERG, "Can't allocate memory! [New_Connection]" );
 			Simple_Message( new_sock, "ERROR: Internal error" );
 			close( new_sock );
-			return;
+			return -1;
 		}
 
 #ifdef DEBUG
@@ -976,12 +1005,11 @@ New_Connection( int Sock )
 
 	/* Client-Struktur initialisieren */
 	c = Client_NewLocal( idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWN, false );
-	if( ! c )
-	{
+	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;
+		return -1;
 	}
 
 	/* Verbindung registrieren */
@@ -990,27 +1018,28 @@ New_Connection( int Sock )
 	My_Connections[idx].addr = new_addr;
 
 	/* Neuen Socket registrieren */
-	io_event_create( new_sock, IO_WANTREAD, cb_clientserver);
+	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;
+	}
 
 	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 );
 
 	/* 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;
+
+	Resolve_Addr(&My_Connections[idx].res_stat, &new_addr,
+		My_Connections[idx].sock, cb_Read_Resolver_Result);
 
 	/* Penalty-Zeit setzen */
 	Conn_SetPenalty( idx, 4 );
+	return new_sock;
 } /* New_Connection */
 
 
-LOCAL CONN_ID
+static CONN_ID
 Socket2Index( int Sock )
 {
 	/* zum Socket passende Connection suchen */
@@ -1034,32 +1063,20 @@ Socket2Index( int 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
 	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;
 #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;
-
 	if (( array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN ) ||
 		( array_bytes(&My_Connections[Idx].zip.rbuf) >= ZREADBUFFER_LEN ))
 #else
@@ -1073,14 +1090,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 -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 ));
+			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,
@@ -1105,17 +1123,25 @@ Read_Request( CONN_ID Idx )
 		}
 	}
 
-	/* Connection-Statistik aktualisieren */
+	/* Update connection statistics */
 	My_Connections[Idx].bytes_in += len;
 
-	/* Timestamp aktualisieren */
-	My_Connections[Idx].lastdata = time( NULL );
-
-	Handle_Buffer( Idx );
+	/* 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(). */
+	c = Client_GetFromConn(Idx);
+	if (c && (Client_Type(c) == CLIENT_USER
+		  || Client_Type(c) == CLIENT_SERVER
+		  || Client_Type(c) == CLIENT_SERVICE))
+		My_Connections[Idx].lastdata = time(NULL);
+
+	/* 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.
@@ -1125,14 +1151,13 @@ Handle_Buffer( CONN_ID Idx )
 #endif
 	char *ptr;
 	int len, delta;
-	unsigned int arraylen;
-	bool action, result;
+	bool result;
 #ifdef ZLIB
 	bool old_z;
 #endif
 
 	result = false;
-	do {
+	for (;;) {
 		/* Check penalty */
 		if( My_Connections[Idx].delaytime > time( NULL )) return result;
 #ifdef ZLIB
@@ -1141,16 +1166,12 @@ Handle_Buffer( CONN_ID Idx )
 			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" );
 
@@ -1168,7 +1189,6 @@ Handle_Buffer( CONN_ID Idx )
 		}
 #endif
 
-		action = false;
 		if( ! ptr )
 			break;
 
@@ -1186,33 +1206,37 @@ 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);
+		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);
 #ifdef DEBUG
-			Log(LOG_DEBUG, "%d byte left in rbuf", array_bytes(&My_Connections[Idx].rbuf));
+		Log(LOG_DEBUG,
+		    "Connection %d: %d bytes left in read buffer.",
+		    Idx, 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 ))
+		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 ));
+				Log( LOG_ALERT, "Connection %d: No space left in unzip buf (need %u bytes)!",
+								Idx, array_bytes(&My_Connections[Idx].rbuf ));
 				return false;
 			}
 			if (!array_copy( &My_Connections[Idx].zip.rbuf, &My_Connections[Idx].rbuf ))
@@ -1220,18 +1244,18 @@ Handle_Buffer( CONN_ID Idx )
 
 			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));
+			Log( LOG_DEBUG, "Moved already received data (%u 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 */
 
 
-LOCAL void
+static void
 Check_Connections( void )
 {
 	/* check if connections are alive. if not, play PING-PONG first.
@@ -1240,7 +1264,8 @@ Check_Connections( void )
 	CONN_ID i;
 
 	for( i = 0; i < Pool_Size; i++ ) {
-		if( My_Connections[i].sock == NONE ) continue;
+		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 )))
@@ -1267,73 +1292,78 @@ Check_Connections( void )
 		}
 		else
 		{
-			/* connection is not fully established yet */
-			if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout )
-			{
-				/* Timeout */
+			/* 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) {
 #ifdef DEBUG
-				Log( LOG_DEBUG, "Connection %d timed out ...", i );
+				Log(LOG_DEBUG,
+				    "Unregistered connection %d timed out ...",
+				    i);
 #endif
-				Conn_Close( i, NULL, "Timeout", false );
+				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++ )
-	{
+	/* Search 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 );
+		if (Resolve_SUCCESS(&My_Connections[idx].res_stat))
+			New_Server(Conf_GetServer( idx ), idx);
 	}
 
 	/* 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;
+		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 );
+		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;
@@ -1341,15 +1371,15 @@ Check_Servers( void )
 		/* 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;
+		assert(Resolve_Getfd(&My_Connections[idx].res_stat) < 0);
+
+		Resolve_Name(&My_Connections[idx].res_stat, Conf_Server[i].host, cb_Read_Resolver_Result);
 	}
 } /* Check_Servers */
 
 
-LOCAL void
+static void
 New_Server( int Server, CONN_ID Idx )
 {
 	/* Establish new server link */
@@ -1362,17 +1392,8 @@ New_Server( int Server, CONN_ID Idx )
 	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 )
@@ -1383,10 +1404,8 @@ New_Server( int Server, CONN_ID Idx )
 #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 );
-		return;
+		goto out;
 	}
 
 	memset( &new_addr, 0, sizeof( new_addr ));
@@ -1395,39 +1414,31 @@ New_Server( int Server, CONN_ID Idx )
 	new_addr.sin_port = htons( Conf_Server[Server].port );
 
 	new_sock = socket( PF_INET, SOCK_STREAM, 0 );
-	if ( new_sock < 0 )
-	{
+	if ( new_sock < 0 ) {
 		/* Can't create socket */
-		Init_Conn_Struct( Idx );
-		Conf_Server[Server].conn_id = NONE;
 		Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
-		return;
+		goto out;
 	}
 
 	if( ! Init_Socket( new_sock )) return;
 
 	res = connect( new_sock, (struct sockaddr *)&new_addr, sizeof( new_addr ));
-	if(( res != 0 ) && ( errno != EINPROGRESS ))
-	{
+	if(( res != 0 ) && ( errno != EINPROGRESS )) {
 		/* Can't connect socket */
 		Log( LOG_CRIT, "Can't connect socket: %s!", strerror( errno ));
 		close( new_sock );
-		Init_Conn_Struct( Idx );
-		Conf_Server[Server].conn_id = NONE;
-		return;
+		goto out;
 	}
 
 	/* Client-Struktur initialisieren */
 	c = Client_NewLocal( Idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWNSERVER, false );
-	if( ! c )
-	{
+	if( ! c ) {
 		/* Can't create new client structure */
-		close( new_sock );
-		Init_Conn_Struct( Idx );
-		Conf_Server[Server].conn_id = NONE;
 		Log( LOG_ALERT, "Can't establish connection: can't create client structure!" );
-		return;
+		close( new_sock );
+		goto out;
 	}
+
 	Client_SetIntroducer( c, c );
 	Client_SetToken( c, TOKEN_OUTBOUND );
 
@@ -1437,16 +1448,24 @@ New_Server( int Server, CONN_ID Idx )
 	strlcpy( My_Connections[Idx].host, Conf_Server[Server].host, sizeof( My_Connections[Idx].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( 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 */
 
 
-LOCAL void
+static void
 Init_Conn_Struct( CONN_ID Idx )
 {
 	time_t now = time( NULL );
@@ -1456,10 +1475,11 @@ Init_Conn_Struct( CONN_ID Idx )
 	My_Connections[Idx].sock = NONE;
 	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) */
@@ -1497,115 +1517,86 @@ Init_Socket( int Sock )
 } /* Init_Socket */
 
 
-GLOBAL
-void Read_Resolver_Result( int r_fd )
+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, n;
+	size_t len;
+	char *identptr;
+#ifdef IDENTAUTH
+	char readbuf[HOST_LEN + 2 + CLIENT_USER_LEN];
+#else
+	char readbuf[HOST_LEN + 1];
+#endif
+
+#ifdef DEBUG
+	Log( LOG_DEBUG, "Resolver: Got callback on fd %d, events %d", r_fd, events );
+#endif
 
-	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!?" );
+		Log( LOG_DEBUG, "Resolver: Got callback for unknown connection!?" );
 #endif
 		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';
+	readbuf[len] = '\0';
+	identptr = strchr(readbuf, '\n');
+	assert(identptr != NULL);
+	if (!identptr) {
+		Log( LOG_CRIT, "Resolver: Got malformed result!");
+		return;
+	}
 
+	*identptr = '\0';
 #ifdef DEBUG
-	Log( LOG_DEBUG, "Got result from resolver: \"%s\" (%d bytes), stage %d.", s->buffer, len, s->stage );
+	Log( LOG_DEBUG, "Got result from resolver: \"%s\" (%u bytes read).", readbuf, len);
 #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
+	 * connections and a host name and IDENT user name (if enabled) for
 	 * incoming connections.*/
-	if( My_Connections[i].sock > NONE )
-	{
+	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 )
-		{
-			switch(s->stage) {
-				case 0: /* host name */
-				strlcpy( My_Connections[i].host, s->buffer, sizeof( My_Connections[i].host ));
-				Client_SetHostname( c, s->buffer );
+		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
-	{
+	} else {
 		/* Outgoing connection (server link): set the IP address
 		 * so that we can connect to it in the main loop. */
 
@@ -1613,18 +1604,15 @@ try_resolve:
 		n = Conf_GetServer( i );
 		assert( n > NONE );
 
-		strlcpy( Conf_Server[n].ip, s->buffer, sizeof( Conf_Server[n].ip ));
+		strlcpy( Conf_Server[n].ip, readbuf, 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
+static void
 Simple_Message( int Sock, char *Msg )
 {
 	char buf[COMMAND_LEN];
@@ -1640,14 +1628,13 @@ Simple_Message( int Sock, char *Msg )
 } /* 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;