X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fconn.c;h=f6a3e7254e4f675554081e9848606324e3f210bd;hb=a17745d6d7c37bebbd5e0cb651579a727389a87f;hp=5ac1af460364f9216bd44d87ea559667916a9b3c;hpb=af9123fd82491efeb683722d58758d92dcca4833;p=ngircd-alex.git

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 5ac1af46..f6a3e725 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.177 2005/09/02 13:28:30 alex Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.188 2006/02/08 15:20:21 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -91,7 +91,7 @@ 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 New_Server PARAMS(( int Server ));
 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 ));
@@ -105,6 +105,8 @@ int deny_severity = LOG_ERR;
 
 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
@@ -137,25 +139,27 @@ cb_connserver(int sock, UNUSED 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));
+
+		/* Clean up the CLIENT structure (to avoid silly log
+ 		 * messages) and call Conn_Close() to do the rest. */
+ 		c = Client_GetFromConn(idx);
+ 		if (c)
+			Client_DestroyNow(c);
+ 
+ 		Conn_Close(idx, "Can't connect!", NULL, false);
+ 
+		return;
 	}
 
 	Conn_OPTION_DEL( &My_Connections[idx], CONN_ISCONNECTING );
@@ -198,22 +202,6 @@ cb_clientserver(int sock, short what)
 }
 
 
-static 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] );
-
-	array_free(&c->res_stat->buffer);
-	free( c->res_stat );
-	c->res_stat = NULL;
-}
-
-
 GLOBAL void
 Conn_Init( void )
 {
@@ -241,9 +229,6 @@ Conn_Init( void )
 
 	array_free( &My_Listeners );
 
-	/* Groesster File-Descriptor fuer select() */
-	Conn_MaxFD = 0;
-
 	/* Connection-Struktur initialisieren */
 	for( i = 0; i < Pool_Size; i++ ) Init_Conn_Struct( i );
 
@@ -335,23 +320,22 @@ 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 */
@@ -384,40 +368,35 @@ 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 );
+			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 -1;
 	}
 
 	if( ! Init_Socket( sock )) return -1;
 
-	/* an Port binden */
-	if( bind( sock, (struct sockaddr *)&addr, (socklen_t)sizeof( addr )) != 0 )
-	{
+	if( bind( sock, (struct sockaddr *)&addr, (socklen_t)sizeof( addr )) != 0 ) {
 		Log( LOG_CRIT, "Can't bind socket: %s!", strerror( errno ));
 		close( sock );
 		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 -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 );
@@ -470,12 +449,10 @@ Conn_Handler( void )
 	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
@@ -483,7 +460,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( );
@@ -492,8 +471,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 ))
 			{
@@ -525,7 +503,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;
@@ -542,12 +520,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));
@@ -756,9 +733,15 @@ Conn_Close( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient )
 			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 = Client_GetFromConn( Idx );
+
 	/* Shut down socket */
 	if( ! io_close( My_Connections[Idx].sock ))
 	{
@@ -789,9 +772,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 );
@@ -827,10 +811,10 @@ 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 );
@@ -842,7 +826,8 @@ 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 */
@@ -858,8 +843,10 @@ Handle_Write( CONN_ID Idx )
 
 	assert( Idx > NONE );
 	if ( My_Connections[Idx].sock < 0 ) {
-		Log(LOG_WARNING,
+#ifdef DEBUG
+		Log(LOG_DEBUG,
 		    "Handle_Write() on closed socket, connection %d", Idx);
+#endif
 		return false;
 	}
 	assert( My_Connections[Idx].sock > NONE );
@@ -919,9 +906,7 @@ 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 i, new_sock, new_sock_len;
 	CLIENT *c;
 	POINTER *ptr;
 	long new_size, cnt;
@@ -964,15 +949,15 @@ New_Connection( int Sock )
 		return -1;
 	}
 
-	/* Freie Connection-Struktur suchen */
-	for( idx = 0; idx < Pool_Size; idx++ ) if( My_Connections[idx].sock == NONE ) break;
-	if( idx >= Pool_Size )
-	{
+#ifdef DEBUG
+	if (new_sock < Pool_Size)	
+		assert(My_Connections[new_sock].sock == NONE );
+#endif	
+	if( new_sock >= 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 */
@@ -1010,15 +995,15 @@ New_Connection( int Sock )
 		My_Connections = (CONNECTION *)ptr;
 
 		/* Initialize new items */
-		for( idx = Pool_Size; idx < new_size; idx++ ) Init_Conn_Struct( idx );
-		idx = Pool_Size;
+		for( i = Pool_Size; i < new_size; i++ )
+			Init_Conn_Struct( i );
 
 		/* Adjust new pool size */
 		Pool_Size = new_size;
 	}
 
 	/* Client-Struktur initialisieren */
-	c = Client_NewLocal( idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWN, false );
+	c = Client_NewLocal( 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" );
@@ -1027,32 +1012,31 @@ New_Connection( int Sock )
 	}
 
 	/* Verbindung registrieren */
-	Init_Conn_Struct( idx );
-	My_Connections[idx].sock = new_sock;
-	My_Connections[idx].addr = new_addr;
+	Init_Conn_Struct( new_sock );
+	My_Connections[new_sock].sock = new_sock;
+	My_Connections[new_sock].addr = new_addr;
 
 	/* Neuen Socket registrieren */
 	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 );
+		Conn_Close( new_sock, "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 );
+	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 */
 
@@ -1062,14 +1046,9 @@ Socket2Index( int Sock )
 {
 	/* zum Socket passende Connection suchen */
 
-	CONN_ID idx;
+	assert( Sock >= 0 );
 
-	assert( Sock > NONE );
-
-	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
@@ -1077,7 +1056,7 @@ Socket2Index( int Sock )
 #endif
 		return NONE;
 	}
-	else return idx;
+	return Sock;
 } /* Socket2Index */
 
 
@@ -1282,7 +1261,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 )))
@@ -1333,17 +1313,8 @@ Check_Servers( void )
 {
 	/* Check if we can establish further server links */
 
-	RES_STAT *s;
-	CONN_ID idx;
 	int i, n;
-
-	/* 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 );
-	}
+	time_t time_now;
 
 	/* Check all configured servers */
 	for( i = 0; i < MAX_SERVERS; i++ ) {
@@ -1354,50 +1325,30 @@ Check_Servers( void )
 
 		/* 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 ))
+			for (n = 0; n < MAX_SERVERS; n++) {
+				if (n == i) continue;
+				if ((Conf_Server[n].conn_id > NONE) &&
+					(Conf_Server[n].group == Conf_Server[i].group))
 						break;
 			}
 			if (n < MAX_SERVERS) continue;
 		}
 
 		/* Check last connect attempt? */
-		if( Conf_Server[i].lasttry > time( NULL ) - Conf_ConnectRetry ) continue;
+		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 */
 
 
 static void
-New_Server( int Server, CONN_ID Idx )
+New_Server( int Server )
 {
 	/* Establish new server link */
 
@@ -1407,16 +1358,6 @@ 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: */
-		Log( LOG_ERR, "Can't connect to \"%s\": ip address unknown!", Conf_Server[Server].host );
-        	Init_Conn_Struct( Idx );
-	        Conf_Server[Server].conn_id = NONE;
-		return;
-	}
 
 	Log( LOG_INFO, "Establishing connection to \"%s\", %s, port %d ... ", Conf_Server[Server].host,
 							Conf_Server[Server].ip, Conf_Server[Server].port );
@@ -1429,9 +1370,9 @@ New_Server( int Server, CONN_ID Idx )
 	if( inaddr.s_addr == (unsigned)-1 )
 #endif
 	{
-		/* Can't convert IP address */
-		Log( LOG_ERR, "Can't connect to \"%s\" (connection %d): can't convert ip address %s!", Conf_Server[Server].host, Idx, Conf_Server[Server].ip );
-		goto out;
+		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 ));
@@ -1441,53 +1382,59 @@ New_Server( int Server, CONN_ID Idx )
 
 	new_sock = socket( PF_INET, SOCK_STREAM, 0 );
 	if ( new_sock < 0 ) {
-		/* Can't create socket */
 		Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
-		goto out;
+		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 */
 		Log( LOG_CRIT, "Can't connect socket: %s!", strerror( errno ));
 		close( new_sock );
-		goto out;
+		return;
+	}
+	if (new_sock >= Pool_Size) {
+		Log( LOG_ALERT, "Can't establist server connection: connection limit reached (%d)!",
+											Pool_Size );
+		close( new_sock );
+		return;
 	}
 
-	/* Client-Struktur initialisieren */
-	c = Client_NewLocal( Idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWNSERVER, false );
+	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 ) {
-		/* Can't create new client structure */
 		Log( LOG_ALERT, "Can't establish connection: can't create client structure!" );
 		close( new_sock );
-		goto out;
+		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;
+	strlcpy( My_Connections[new_sock].host, Conf_Server[Server].host,
+				sizeof(My_Connections[new_sock].host ));
 
 	/* Register new socket */
 	if (!io_event_create( new_sock, IO_WANTWRITE, cb_connserver)) {
 		Log( LOG_ALERT, "io_event_create(): could not add fd %d", strerror(errno));
-		Conn_Close( Idx, "io_event_create() failed", NULL, false );
-		goto out;
+		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 );
+	Log( LOG_DEBUG, "Registered new connection %d on socket %d.",
+				new_sock, My_Connections[new_sock].sock );
 #endif
-	Conn_OPTION_ADD( &My_Connections[Idx], CONN_ISCONNECTING );
-	return;
-out:
-	Init_Conn_Struct( Idx );
-	Conf_Server[Server].conn_id = NONE;
+	Conn_OPTION_ADD( &My_Connections[new_sock], CONN_ISCONNECTING );
 } /* New_Server */
 
 
@@ -1498,9 +1445,10 @@ Init_Conn_Struct( CONN_ID Idx )
 	/* 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 */
 
 
@@ -1542,145 +1490,130 @@ 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];
+
+#ifdef DEBUG
+	Log( LOG_DEBUG, "Resolver: Got forward lookup callback on fd %d, events %d", fd, events);
+#endif
+	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 );
+#ifdef DEBUG
+		Log( LOG_DEBUG, "Resolver: Got Forward Lookup callback for unknown server!?" );
+#endif
+		return;
+	}
+
+	/* Read result from pipe */
+	len = Resolve_Read(&Conf_Server[i].res_stat, readbuf, sizeof readbuf -1);
+	if (len == 0)
+		return;
+	
+	readbuf[len] = '\0';
+#ifdef DEBUG
+	Log( LOG_DEBUG, "Got result from resolver: \"%s\" (%u bytes read).", readbuf, len);
+#endif
+	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 bytes_read, i, n;
-	unsigned int len;
-	RES_STAT *s;
-	char *ptr;
-	char *bufptr;
-	char readbuf[HOST_LEN];
+	int i;
+	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", r_fd );
 	/* Search associated connection ... */
 	for( i = 0; i < Pool_Size; i++ ) {
 		if(( My_Connections[i].sock != NONE )
-		  && ( My_Connections[i].res_stat != NULL )
-		  && ( My_Connections[i].res_stat->pipe[0] == r_fd ))
+		  && ( 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 */
-	bytes_read = read( r_fd, readbuf, sizeof readbuf -1 );
-	if( bytes_read < 0 ) {
-		/* Error! */
-		Log( LOG_CRIT, "Resolver: Can't read result: %s!", strerror( errno ));
-		FreeRes_stat( &My_Connections[i] );
+	len = Resolve_Read(&My_Connections[i].res_stat, readbuf, sizeof readbuf -1);
+	if (len == 0)
 		return;
-	}
-	len = (unsigned int) bytes_read;
-	readbuf[len] = '\0';
-	if (!array_catb(&s->buffer, readbuf, len)) {
-		Log( LOG_CRIT, "Resolver: Can't append result %s to buffer: %s", readbuf, strerror( errno ));
-		FreeRes_stat(&My_Connections[i]);
-		return;
-	}
 
-	if (!array_cat0_temporary(&s->buffer)) {
-		Log( LOG_CRIT, "Resolver: Can't append result %s to buffer: %s", readbuf, strerror( errno ));
-		FreeRes_stat(&My_Connections[i]);
+	readbuf[len] = '\0';
+	identptr = strchr(readbuf, '\n');
+	assert(identptr != NULL);
+	if (!identptr) {
+		Log( LOG_CRIT, "Resolver: Got malformed result!");
 		return;
 	}
 
-	/* If the result string is incomplete, return to main loop and
-	 * wait until we can read in more bytes. */
-#ifdef IDENTAUTH
-try_resolve:
-#endif
-	bufptr = (char*) array_start(&s->buffer);
-	assert(bufptr != NULL);
-	ptr = strchr( bufptr, '\n' );
-	if( ! ptr ) return;
-	*ptr = '\0';
-
+	*identptr = '\0';
 #ifdef DEBUG
-	Log( LOG_DEBUG, "Got result from resolver: \"%s\" (%u bytes read), stage %d.", bufptr, 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 )
-	{
-		/* 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, bufptr, sizeof( My_Connections[i].host));
+	assert ( My_Connections[i].sock >= 0 );
+	/* Incoming connection. Search client ... */
+	c = Client_GetFromConn( i );
+	assert( c != NULL );
 
-				Client_SetHostname( c, bufptr);
+	/* 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(bufptr) + 1;
-				assert(len <= array_bytes(&s->buffer));
-				array_moveleft(&s->buffer, 1, len);
-
-				/* Don't close pipe and clean up, but
-				 * instead wait for IDENT result */
-				s->stage = 1;
-				goto try_resolve;
-
-				case 1: /* IDENT user name */
-				if (array_bytes(&s->buffer)) {
-					bufptr = (char*) array_start(&s->buffer);
-					Log( LOG_INFO, "IDENT lookup for connection %ld: \"%s\".", i, bufptr);
-					Client_SetUser( c, bufptr, true );
-				}
-				else Log( LOG_INFO, "IDENT lookup for connection %ld: no result.", i );
-#endif
-				break;
-				default:
-				Log( LOG_ERR, "Resolver: got result for unknown stage %d!?", s->stage );
-			}
+		++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 );
-
-		bufptr = (char*) array_start(&s->buffer);
-		strlcpy( Conf_Server[n].ip, bufptr, sizeof( Conf_Server[n].ip ));
-	}
-
-	/* Clean up ... */
-	FreeRes_stat( &My_Connections[i] );
-
 	/* Reset penalty time */
 	Conn_ResetPenalty( i );
-} /* Read_Resolver_Result */
+} /* cb_Read_Resolver_Result */
 
 
 static void
@@ -1705,8 +1638,7 @@ 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;