X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconn.c;h=d35a091791893ac6eb071c3b9f3a1a326ca69c95;hp=95e6d545fd97fb1930f18fec3858a47cc8b9993b;hb=a1ff081b8a59f8f9e4d4f873d1648b265819679b;hpb=695631b2984111a825346396dc56635a2fe3a7c4

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 95e6d545..d35a0917 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -12,9 +12,11 @@
  */
 
 
+#define CONN_MODULE
+
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conn.c,v 1.109 2002/12/26 17:04:54 alex Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.122 2003/04/21 10:52:26 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -38,71 +40,39 @@ static char UNUSED id[] = "$Id: conn.c,v 1.109 2002/12/26 17:04:54 alex Exp $";
 #endif
 
 #ifdef HAVE_STDINT_H
-#include <stdint.h>			/* u.a. fuer Mac OS X */
+#include <stdint.h>			/* e.g. for Mac OS X */
 #endif
 
-#ifdef USE_ZLIB
-#include <zlib.h>
+#ifdef USE_TCPWRAP
+#include <tcpd.h>			/* for TCP Wrappers */
 #endif
 
+#include "defines.h"
+#include "resolve.h"
+
 #include "exp.h"
 #include "conn.h"
 
 #include "imp.h"
 #include "ngircd.h"
 #include "client.h"
-#include "resolve.h"
 #include "conf.h"
+#include "conn-zip.h"
+#include "conn-func.h"
 #include "log.h"
 #include "parse.h"
 #include "tool.h"
 
+#ifdef RENDEZVOUS
+#include "rendezvous.h"
+#endif
+
 #include "exp.h"
 
 
 #define SERVER_WAIT (NONE - 1)
 
 
-#ifdef USE_ZLIB
-typedef struct _ZipData
-{
-	z_stream in;			/* "Handle" fuer Input-Stream */
-	z_stream out;			/* "Handle" fuer Output-Stream */
-	CHAR rbuf[READBUFFER_LEN];	/* Lesepuffer */
-	INT rdatalen;			/* Laenge der Daten im Lesepuffer (komprimiert) */
-	CHAR wbuf[WRITEBUFFER_LEN];	/* Schreibpuffer */
-	INT wdatalen;			/* Laenge der Daten im Schreibpuffer (unkomprimiert) */
-	LONG bytes_in, bytes_out;	/* Counter fuer Statistik (unkomprimiert!) */
-} ZIPDATA;
-#endif
-
-
-typedef struct _Connection
-{
-	INT sock;			/* Socket Handle */
-	struct sockaddr_in addr;	/* Adresse des Client */
-	RES_STAT *res_stat;		/* "Resolver-Status", s.o. */
-	CHAR host[HOST_LEN];		/* Hostname */
-	CHAR rbuf[READBUFFER_LEN];	/* Lesepuffer */
-	INT rdatalen;			/* Laenge der Daten im Lesepuffer */
-	CHAR wbuf[WRITEBUFFER_LEN];	/* Schreibpuffer */
-	INT wdatalen;			/* Laenge der Daten im Schreibpuffer */
-	INT our_server;			/* wenn von uns zu connectender Server: ID */
-	time_t starttime;		/* Startzeit des Links */
-	time_t lastdata;		/* Letzte Aktivitaet */
-	time_t lastping;		/* Letzter PING */
-	time_t lastprivmsg;		/* Letzte PRIVMSG */
-	time_t delaytime;		/* Nicht beachten bis ("penalty") */
-	LONG bytes_in, bytes_out;	/* Empfangene uns gesendete Bytes */
-	LONG msg_in, msg_out;		/* Empfangene uns gesendete Nachtichten */
-	INT flag;			/* "Markierungs-Flag" (vgl. "irc-write"-Modul) */
-	INT options;			/* Link-Optionen */
-#ifdef USE_ZLIB
-	ZIPDATA zip;			/* Kompressionsinformationen */
-#endif
-} CONNECTION;
-
-
 LOCAL VOID Handle_Read PARAMS(( INT sock ));
 LOCAL BOOLEAN Handle_Write PARAMS(( CONN_ID Idx ));
 LOCAL VOID New_Connection PARAMS(( INT Sock ));
@@ -112,24 +82,20 @@ LOCAL BOOLEAN Try_Write PARAMS(( CONN_ID Idx ));
 LOCAL BOOLEAN Handle_Buffer PARAMS(( CONN_ID Idx ));
 LOCAL VOID Check_Connections PARAMS(( VOID ));
 LOCAL VOID Check_Servers PARAMS(( VOID ));
-LOCAL VOID Init_Conn_Struct PARAMS(( LONG Idx ));
+LOCAL VOID Init_Conn_Struct PARAMS(( CONN_ID Idx ));
 LOCAL BOOLEAN Init_Socket PARAMS(( INT Sock ));
 LOCAL VOID New_Server PARAMS(( INT Server, CONN_ID Idx ));
 LOCAL VOID Read_Resolver_Result PARAMS(( INT r_fd ));
-
-#ifdef USE_ZLIB
-LOCAL BOOLEAN Zip_Buffer PARAMS(( CONN_ID Idx, CHAR *Data, INT Len ));
-LOCAL BOOLEAN Zip_Flush PARAMS(( CONN_ID Idx ));
-LOCAL BOOLEAN Unzip_Buffer PARAMS(( CONN_ID Idx ));
-#endif
-
+LOCAL VOID Simple_Message PARAMS(( INT Sock, CHAR *Msg ));
 
 LOCAL fd_set My_Listeners;
 LOCAL fd_set My_Sockets;
 LOCAL fd_set My_Connects;
 
-LOCAL CONNECTION *My_Connections;
-LOCAL LONG Pool_Size, WCounter;
+#ifdef USE_TCPWRAP
+INT allow_severity = LOG_INFO;
+INT deny_severity = LOG_ERR;
+#endif
 
 
 GLOBAL VOID
@@ -153,7 +119,7 @@ Conn_Init( VOID )
 		Log( LOG_EMERG, "Can't allocate memory! [Conn_Init]" );
 		exit( 1 );
 	}
-	Log( LOG_DEBUG, "Allocted connection pool for %ld items (%ld bytes).", Pool_Size, sizeof( CONNECTION ) * Pool_Size );
+	Log( LOG_DEBUG, "Allocted connection pool for %d items (%ld bytes).", Pool_Size, sizeof( CONNECTION ) * Pool_Size );
 
 	/* zu Beginn haben wir keine Verbindungen */
 	FD_ZERO( &My_Listeners );
@@ -180,8 +146,13 @@ Conn_Exit( VOID )
 	CONN_ID idx;
 	INT i;
 
-	/* Sockets schliessen */
 	Log( LOG_DEBUG, "Shutting down all connections ..." );
+
+#ifdef RENDEZVOUS
+	Rendezvous_UnregisterListeners( );
+#endif
+	
+	/* Sockets schliessen */
 	for( i = 0; i < Conn_MaxFD + 1; i++ )
 	{
 		if( FD_ISSET( i, &My_Sockets ))
@@ -222,8 +193,7 @@ Conn_Exit( VOID )
 GLOBAL INT
 Conn_InitListeners( VOID )
 {
-	/* Ports, auf denen der Server Verbindungen entgegennehmen
-	* soll, initialisieren */
+	/* Initialize ports on which the server should accept connections */
 
 	INT created, i;
 
@@ -240,10 +210,14 @@ Conn_InitListeners( VOID )
 GLOBAL VOID
 Conn_ExitListeners( VOID )
 {
-	/* Alle "Listen-Sockets" schliessen */
+	/* Close down all listening sockets */
 
 	INT i;
 
+#ifdef RENDEZVOUS
+	Rendezvous_UnregisterListeners( );
+#endif
+	
 	Log( LOG_INFO, "Shutting down all listening sockets ..." );
 	for( i = 0; i < Conn_MaxFD + 1; i++ )
 	{
@@ -259,13 +233,14 @@ Conn_ExitListeners( VOID )
 GLOBAL BOOLEAN
 Conn_NewListener( CONST UINT Port )
 {
-	/* Neuen Listen-Socket erzeugen: der Server wartet dann auf
-	 * dem angegebenen Port auf Verbindungen. Kann der Listen-
-	 * Socket nicht erteugt werden, so wird NULL geliefert.*/
+	/* Create new listening socket on specified port */
 
 	struct sockaddr_in addr;
 	INT sock;
-
+#ifdef RENDEZVOUS
+	CHAR name[CLIENT_ID_LEN], *info;
+#endif
+	
 	/* Server-"Listen"-Socket initialisieren */
 	memset( &addr, 0, sizeof( addr ));
 	addr.sin_family = AF_INET;
@@ -306,6 +281,34 @@ Conn_NewListener( CONST UINT Port )
 
 	Log( LOG_INFO, "Now listening on port %d (socket %d).", Port, sock );
 
+#ifdef RENDEZVOUS
+	/* Get best server description text */
+	if( ! Conf_ServerInfo[0] ) info = Conf_ServerName;
+	else
+	{
+		/* Use server info string */
+		info = NULL;
+		if( Conf_ServerInfo[0] == '[' )
+		{
+			/* Cut off leading hostname part in "[]" */
+			info = strchr( Conf_ServerInfo, ']' );
+			if( info )
+			{
+				info++;
+				while( *info == ' ' ) info++;
+			}
+		}
+		if( ! info ) info = Conf_ServerInfo;
+	}
+
+	/* Add port number to description if non-standard */
+	if( Port != 6667 ) snprintf( name, sizeof( name ), "%s (port %u)", info, Port );
+	else strlcpy( name, info, sizeof( name ));
+
+	/* Register service */
+	Rendezvous_Register( name, RENDEZVOUS_TYPE, Port );
+#endif
+
 	return TRUE;
 } /* Conn_NewListener */
 
@@ -328,7 +331,7 @@ Conn_Handler( VOID )
 	fd_set read_sockets, write_sockets;
 	struct timeval tv;
 	time_t start, t;
-	LONG i, idx;
+	CONN_ID i, idx;
 	BOOLEAN timeout;
 
 	start = time( NULL );
@@ -336,6 +339,10 @@ Conn_Handler( VOID )
 	{
 		timeout = TRUE;
 
+#ifdef RENDEZVOUS
+		Rendezvous_Handler( );
+#endif
+
 		/* Should the configuration be reloaded? */
 		if( NGIRCd_SignalRehash ) NGIRCd_Rehash( );
 
@@ -367,6 +374,7 @@ Conn_Handler( VOID )
 				FD_SET( My_Connections[i].sock, &write_sockets );
 			}
 		}
+
 		/* Sockets mit im Aufbau befindlichen ausgehenden Verbindungen suchen */
 		for( i = 0; i < Pool_Size; i++ )
 		{
@@ -392,7 +400,6 @@ Conn_Handler( VOID )
 			{
 				/* Fuer die Verbindung ist eine "Penalty-Zeit" gesetzt */
 				FD_CLR( My_Connections[i].sock, &read_sockets );
-				FD_CLR( My_Connections[i].sock, &write_sockets );
 			}
 		}
 		for( i = 0; i < Conn_MaxFD + 1; i++ )
@@ -422,7 +429,7 @@ Conn_Handler( VOID )
 			if( errno != EINTR )
 			{
 				Log( LOG_EMERG, "Conn_Handler(): select(): %s!", strerror( errno ));
-				Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+				Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
 				exit( 1 );
 			}
 			continue;
@@ -567,8 +574,8 @@ Conn_Write( CONN_ID Idx, CHAR *Data, INT Len )
 GLOBAL VOID
 Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )
 {
-	/* Verbindung schliessen. Evtl. noch von Resolver
-	 * Sub-Prozessen offene Pipes werden geschlossen. */
+	/* Close connection. Open pipes of asyncronous resolver
+	 * sub-processes are closed down. */
 
 	CLIENT *c;
 	DOUBLE in_k, out_k;
@@ -580,80 +587,90 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )
 	assert( Idx > NONE );
 	assert( My_Connections[Idx].sock > NONE );
 
+	/* Is this link already shutting down? */
+	if( My_Connections[Idx].options & CONN_ISCLOSING )
+	{
+		/* Conn_Close() has been called recursively for this link;
+		 * probabe reason: Try_Write() failed  -- see below. */
+		return;
+	}
+
+	/* Mark link as "closing" */
+	My_Connections[Idx].options |= CONN_ISCLOSING;
+
+	/* Search client, if any */
 	c = Client_GetFromConn( Idx );
 
+	/* Should the client be informed? */
 	if( InformClient )
 	{
 #ifndef STRICT_RFC
-		/* Statistik an Client melden, wenn User */
+		/* 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 );
 		}
 #endif
 
-		/* ERROR an Client schicken (von RFC so vorgesehen!) */
+		/* Send ERROR to client (see RFC!) */
 		if( FwdMsg ) Conn_WriteStr( Idx, "ERROR :%s", FwdMsg );
 		else Conn_WriteStr( Idx, "ERROR :Closing connection." );
 		if( My_Connections[Idx].sock == NONE ) return;
 	}
 
-	/* zunaechst versuchen, noch im Schreibpuffer vorhandene
-	 * Daten auf den Socket zu schreiben ... */
-	Try_Write( Idx );
+	/* Try to write out the write buffer */
+	(VOID)Try_Write( Idx );
 
+	/* Shut down socket */
 	if( close( My_Connections[Idx].sock ) != 0 )
 	{
-		Log( LOG_ERR, "Error closing connection %d (socket %d) with %s:%d - %s!", Idx, My_Connections[Idx].sock, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port), strerror( errno ));
-	}
-	else
-	{
-		in_k = (DOUBLE)My_Connections[Idx].bytes_in / 1024;
-		out_k = (DOUBLE)My_Connections[Idx].bytes_out / 1024;
-#ifdef USE_ZLIB
-		if( My_Connections[Idx].options & CONN_ZIP )
-		{
-			in_z_k = (DOUBLE)My_Connections[Idx].zip.bytes_in / 1024;
-			out_z_k = (DOUBLE)My_Connections[Idx].zip.bytes_out / 1024;
-			in_p = (INT)(( in_k * 100 ) / in_z_k );
-			out_p = (INT)(( out_k * 100 ) / out_z_k );
-			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 );
-		}
+		/* Oops, we can't close the socket!? This is fatal! */
+		Log( LOG_EMERG, "Error closing connection %d (socket %d) with %s:%d - %s!", Idx, My_Connections[Idx].sock, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port), strerror( errno ));
+		Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
+		exit( 1 );
 	}
-	
-	/* Socket als "ungueltig" markieren */
+
+	/* Mark socket as invalid: */
 	FD_CLR( My_Connections[Idx].sock, &My_Sockets );
 	FD_CLR( My_Connections[Idx].sock, &My_Connects );
 	My_Connections[Idx].sock = NONE;
 
+	/* If there is still a client, unregister it now */
 	if( c ) Client_Destroy( c, LogMsg, FwdMsg, TRUE );
 
+	/* Calculate statistics and log information */
+	in_k = (DOUBLE)My_Connections[Idx].bytes_in / 1024;
+	out_k = (DOUBLE)My_Connections[Idx].bytes_out / 1024;
+#ifdef USE_ZLIB
+	if( My_Connections[Idx].options & CONN_ZIP )
+	{
+		in_z_k = (DOUBLE)My_Connections[Idx].zip.bytes_in / 1024;
+		out_z_k = (DOUBLE)My_Connections[Idx].zip.bytes_out / 1024;
+		in_p = (INT)(( in_k * 100 ) / in_z_k );
+		out_p = (INT)(( out_k * 100 ) / out_z_k );
+		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 );
+	}
+
+	/* Is there a resolver sub-process running? */
 	if( My_Connections[Idx].res_stat )
 	{
-		/* Resolver-Strukturen freigeben, wenn noch nicht geschehen */
+		/* Free resolver structures */
 		FD_CLR( My_Connections[Idx].res_stat->pipe[0], &Resolver_FDs );
 		close( My_Connections[Idx].res_stat->pipe[0] );
 		close( My_Connections[Idx].res_stat->pipe[1] );
 		free( My_Connections[Idx].res_stat );
 	}
 
-	/* Startzeit des naechsten Connect-Versuchs modifizieren? */
-	if(( My_Connections[Idx].our_server > NONE ) && ( Conf_Server[My_Connections[Idx].our_server].lasttry <  time( NULL ) - Conf_ConnectRetry ))
-	{
-		/* Okay, die Verbindung stand schon "genuegend lange":
-		 * lasttry-Zeitpunkt so setzen, dass der naechste
-		 * Verbindungsversuch in RECONNECT_DELAY Sekunden
-		 * gestartet wird. */
-		Conf_Server[My_Connections[Idx].our_server].lasttry = time( NULL ) - Conf_ConnectRetry + RECONNECT_DELAY;
-	}
+	/* Servers: Modify time of next connect attempt? */
+	Conf_UnsetServer( Idx );
 
 #ifdef USE_ZLIB
-	/* Ggf. zlib abmelden */
+	/* Clean up zlib, if link was compressed */
 	if( Conn_Options( Idx ) & CONN_ZIP )
 	{
 		inflateEnd( &My_Connections[Idx].zip.in );
@@ -661,336 +678,40 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )
 	}
 #endif
 
-	/* Connection-Struktur loeschen (=freigeben) */
+	/* Clean up connection structure (=free it) */
 	Init_Conn_Struct( Idx );
 } /* Conn_Close */
 
 
 GLOBAL VOID
-Conn_UpdateIdle( CONN_ID Idx )
-{
-	/* Idle-Timer zuruecksetzen */
-
-	assert( Idx > NONE );
-	My_Connections[Idx].lastprivmsg = time( NULL );
-}
-
-
-GLOBAL time_t
-Conn_GetIdle( CONN_ID Idx )
-{
-	/* Idle-Time einer Verbindung liefern (in Sekunden) */
-
-	assert( Idx > NONE );
-	return time( NULL ) - My_Connections[Idx].lastprivmsg;
-} /* Conn_GetIdle */
-
-
-GLOBAL time_t
-Conn_LastPing( CONN_ID Idx )
-{
-	/* Zeitpunkt des letzten PING liefern */
-
-	assert( Idx > NONE );
-	return My_Connections[Idx].lastping;
-} /* Conn_LastPing */
-
-
-GLOBAL VOID
-Conn_SetPenalty( CONN_ID Idx, time_t Seconds )
-{
-	/* Penalty-Delay fuer eine Verbindung (in Sekunden) setzen;
-	 * waehrend dieser Zeit wird der entsprechende Socket vom Server
-	 * bei Lese-Operationen komplett ignoriert. Der Delay kann mit
-	 * dieser Funktion nur erhoeht, nicht aber verringert werden. */
-	
-	time_t t;
-	
-	assert( Idx > NONE );
-	assert( Seconds >= 0 );
-	
-	t = time( NULL ) + Seconds;
-	if( t > My_Connections[Idx].delaytime ) My_Connections[Idx].delaytime = t;
-} /* Conn_SetPenalty */
-
-
-GLOBAL VOID
-Conn_ResetPenalty( CONN_ID Idx )
-{
-	assert( Idx > NONE );
-	My_Connections[Idx].delaytime = 0;
-} /* Conn_ResetPenalty */
-
-
-GLOBAL VOID
-Conn_ClearFlags( VOID )
-{
-	/* Alle Connection auf "nicht-markiert" setzen */
-
-	LONG i;
-
-	for( i = 0; i < Pool_Size; i++ ) My_Connections[i].flag = 0;
-} /* Conn_ClearFlags */
-
-
-GLOBAL INT
-Conn_Flag( CONN_ID Idx )
-{
-	/* Ist eine Connection markiert (TRUE) oder nicht? */
-
-	assert( Idx > NONE );
-	return My_Connections[Idx].flag;
-} /* Conn_Flag */
-
-
-GLOBAL VOID
-Conn_SetFlag( CONN_ID Idx, INT Flag )
+Conn_SyncServerStruct( VOID )
 {
-	/* Connection markieren */
-
-	assert( Idx > NONE );
-	My_Connections[Idx].flag = Flag;
-} /* Conn_SetFlag */
-
+	/* Synchronize server structures (connection IDs):
+	 * connections <-> configuration */
 
-GLOBAL CONN_ID
-Conn_First( VOID )
-{
-	/* Connection-Struktur der ersten Verbindung liefern;
-	 * Ist keine Verbindung vorhanden, wird NONE geliefert. */
+	CLIENT *client;
+	CONN_ID i;
+	INT c;
 
-	LONG i;
-	
 	for( i = 0; i < Pool_Size; i++ )
 	{
-		if( My_Connections[i].sock != NONE ) return i;
-	}
-	return NONE;
-} /* Conn_First */
-
-
-GLOBAL CONN_ID
-Conn_Next( CONN_ID Idx )
-{
-	/* Naechste Verbindungs-Struktur liefern; existiert keine
-	 * weitere, so wird NONE geliefert. */
-
-	LONG i = NONE;
-
-	assert( Idx > NONE );
-	
-	for( i = Idx + 1; i < Pool_Size; i++ )
-	{
-		if( My_Connections[i].sock != NONE ) return i;
-	}
-	return NONE;
-} /* Conn_Next */
-
-
-GLOBAL VOID
-Conn_SetServer( CONN_ID Idx, INT ConfServer )
-{
-	/* Connection als Server markieren: Index des konfigurierten
-	 * Servers speichern. Verbindung muss bereits bestehen! */
-	
-	assert( Idx > NONE );
-	assert( My_Connections[Idx].sock > NONE );
-	
-	My_Connections[Idx].our_server = ConfServer;
-} /* Conn_SetServer */
-
-
-GLOBAL VOID
-Conn_SetOption( CONN_ID Idx, INT Option )
-{
-	/* Option fuer Verbindung setzen.
-	 * Initial sind alle Optionen _nicht_ gesetzt. */
-
-	assert( Idx > NONE );
-	assert( Option != 0 );
-
-	My_Connections[Idx].options |= Option;
-} /* Conn_SetOption */
-
-
-GLOBAL VOID
-Conn_UnsetOption( CONN_ID Idx, INT Option )
-{
-	/* Option fuer Verbindung loeschen */
-
-	assert( Idx > NONE );
-	assert( Option != 0 );
-
-	My_Connections[Idx].options &= ~Option;
-} /* Conn_UnsetOption */
-
-
-GLOBAL INT
-Conn_Options( CONN_ID Idx )
-{
-	assert( Idx > NONE );
-	return My_Connections[Idx].options;
-} /* Conn_Options */
-
-
-#ifdef USE_ZLIB
-
-GLOBAL BOOLEAN
-Conn_InitZip( CONN_ID Idx )
-{
-	/* Kompression fuer Link initialisieren */
-
-	assert( Idx > NONE );
+		/* Established connection? */
+		if( My_Connections[i].sock <= NONE ) continue;
 
-	My_Connections[Idx].zip.in.avail_in = 0;
-	My_Connections[Idx].zip.in.total_in = 0;
-	My_Connections[Idx].zip.in.total_out = 0;
-	My_Connections[Idx].zip.in.zalloc = NULL;
-	My_Connections[Idx].zip.in.zfree = NULL;
-	My_Connections[Idx].zip.in.data_type = Z_ASCII;
+		/* Server connection? */
+		client = Client_GetFromConn( i );
+		if(( ! client ) || ( Client_Type( client ) != CLIENT_SERVER )) continue;
 
-	if( inflateInit( &My_Connections[Idx].zip.in ) != Z_OK )
-	{
-		/* Fehler! */
-		Log( LOG_ALERT, "Can't initialize compression on connection %d (zlib inflate)!", Idx );
-		return FALSE;
-	}
-	
-	My_Connections[Idx].zip.out.total_in = 0;
-	My_Connections[Idx].zip.out.total_in = 0;
-	My_Connections[Idx].zip.out.zalloc = NULL;
-	My_Connections[Idx].zip.out.zfree = NULL;
-	My_Connections[Idx].zip.out.data_type = Z_ASCII;
+		for( c = 0; c < MAX_SERVERS; c++ )
+		{
+			/* Configured server? */
+			if( ! Conf_Server[c].host[0] ) continue;
 
-	if( deflateInit( &My_Connections[Idx].zip.out, Z_DEFAULT_COMPRESSION ) != Z_OK )
-	{
-		/* Fehler! */
-		Log( LOG_ALERT, "Can't initialize compression on connection %d (zlib deflate)!", Idx );
-		return FALSE;
+			/* Duplicate? */
+			if( strcmp( Conf_Server[c].name, Client_ID( client )) == 0 ) Conf_Server[c].conn_id = i;
+		}
 	}
-
-	My_Connections[Idx].zip.bytes_in = My_Connections[Idx].bytes_in;
-	My_Connections[Idx].zip.bytes_out = My_Connections[Idx].bytes_out;
-
-	Log( LOG_INFO, "Enabled link compression (zlib) on connection %d.", Idx );
-	Conn_SetOption( Idx, CONN_ZIP );
-
-	return TRUE;
-} /* Conn_InitZip */
-
-
-GLOBAL LONG
-Conn_SendBytesZip( CONN_ID Idx )
-{
-	/* Anzahl gesendeter Bytes (komprimiert!) liefern */
-
-	assert( Idx > NONE );
-	return My_Connections[Idx].zip.bytes_out;
-} /* Conn_SendBytesZip */
-
-
-GLOBAL LONG
-Conn_RecvBytesZip( CONN_ID Idx )
-{
-	/* Anzahl gesendeter Bytes (komprimiert!) liefern */
-
-	assert( Idx > NONE );
-	return My_Connections[Idx].zip.bytes_in;
-} /* Conn_RecvBytesZip */
-
-#endif
-
-
-GLOBAL time_t
-Conn_StartTime( CONN_ID Idx )
-{
-	/* Zeitpunkt des Link-Starts liefern (in Sekunden) */
-
-	assert( Idx > NONE );
-	return My_Connections[Idx].starttime;
-} /* Conn_Uptime */
-
-
-GLOBAL INT
-Conn_SendQ( CONN_ID Idx )
-{
-	/* Laenge der Daten im Schreibbuffer liefern */
-
-	assert( Idx > NONE );
-#ifdef USE_ZLIB
-	if( My_Connections[Idx].options & CONN_ZIP ) return My_Connections[Idx].zip.wdatalen;
-	else
-#endif
-	return My_Connections[Idx].wdatalen;
-} /* Conn_SendQ */
-
-
-GLOBAL LONG
-Conn_SendMsg( CONN_ID Idx )
-{
-	/* Anzahl gesendeter Nachrichten liefern */
-
-	assert( Idx > NONE );
-	return My_Connections[Idx].msg_out;
-} /* Conn_SendMsg */
-
-
-GLOBAL LONG
-Conn_SendBytes( CONN_ID Idx )
-{
-	/* Anzahl gesendeter Bytes (unkomprimiert) liefern */
-
-	assert( Idx > NONE );
-	return My_Connections[Idx].bytes_out;
-} /* Conn_SendBytes */
-
-
-GLOBAL INT
-Conn_RecvQ( CONN_ID Idx )
-{
-	/* Laenge der Daten im Lesebuffer liefern */
-
-	assert( Idx > NONE );
-#ifdef USE_ZLIB
-	if( My_Connections[Idx].options & CONN_ZIP ) return My_Connections[Idx].zip.rdatalen;
-	else
-#endif
-	return My_Connections[Idx].rdatalen;
-} /* Conn_RecvQ */
-
-
-GLOBAL LONG
-Conn_RecvMsg( CONN_ID Idx )
-{
-	/* Anzahl empfangener Nachrichten liefern */
-
-	assert( Idx > NONE );
-	return My_Connections[Idx].msg_in;
-} /* Conn_RecvMsg */
-
-
-GLOBAL LONG
-Conn_RecvBytes( CONN_ID Idx )
-{
-	/* Anzahl empfangener Bytes (unkomprimiert) liefern */
-
-	assert( Idx > NONE );
-	return My_Connections[Idx].bytes_in;
-} /* Conn_RecvBytes */
-
-
-GLOBAL VOID
-Conn_ResetWCounter( VOID )
-{
-	WCounter = 0;
-} /* Conn_ResetWCounter */
-
-
-GLOBAL LONG
-Conn_WCounter( VOID )
-{
-	return WCounter;
-} /* Conn_WCounter */
+} /* SyncServerStruct */
 
 
 LOCAL BOOLEAN
@@ -1077,6 +798,8 @@ Handle_Write( CONN_ID Idx )
 	/* Daten aus Schreibpuffer versenden bzw. Connection aufbauen */
 
 	INT len, res, err;
+	socklen_t sock_len;
+	CLIENT *c;
 
 	assert( Idx > NONE );
 	assert( My_Connections[Idx].sock > NONE );
@@ -1089,31 +812,34 @@ Handle_Write( CONN_ID Idx )
 		FD_CLR( My_Connections[Idx].sock, &My_Connects );
 
 		/* Ergebnis des connect() ermitteln */
-		len = sizeof( err );
-		res = getsockopt( My_Connections[Idx].sock, SOL_SOCKET, SO_ERROR, &err, &len );
-		assert( len == sizeof( err ));
+		sock_len = sizeof( err );
+		res = getsockopt( My_Connections[Idx].sock, SOL_SOCKET, SO_ERROR, &err, &sock_len );
+		assert( sock_len == sizeof( err ));
 
 		/* Fehler aufgetreten? */
 		if(( res != 0 ) || ( err != 0 ))
 		{
 			/* Fehler! */
 			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[My_Connections[Idx].our_server].port, Idx, strerror( err ));
+			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 ));
 
-			/* Socket etc. pp. aufraeumen */
+			/* Clean up socket, connection and client structures */
 			FD_CLR( My_Connections[Idx].sock, &My_Sockets );
+			c = Client_GetFromConn( Idx );
+			if( c ) Client_DestroyNow( c );
 			close( My_Connections[Idx].sock );
 			Init_Conn_Struct( Idx );
 
 			/* Bei Server-Verbindungen lasttry-Zeitpunkt auf "jetzt" setzen */
-			Conf_Server[My_Connections[Idx].our_server].lasttry = time( NULL );
+			Conf_Server[Conf_GetServer( Idx )].lasttry = time( NULL );
+			Conf_UnsetServer( Idx );
 
 			return FALSE;
 		}
-		Log( LOG_DEBUG, "Connection %d with \"%s:%d\" established, now sendig PASS and SERVER ...", Idx, My_Connections[Idx].host, Conf_Server[My_Connections[Idx].our_server].port );
+		Log( LOG_DEBUG, "Connection %d with \"%s:%d\" established, now sendig PASS and SERVER ...", Idx, My_Connections[Idx].host, Conf_Server[Conf_GetServer( Idx )].port );
 
 		/* PASS und SERVER verschicken */
-		Conn_WriteStr( Idx, "PASS %s %s", Conf_Server[My_Connections[Idx].our_server].pwd_out, NGIRCd_ProtoID );
+		Conn_WriteStr( Idx, "PASS %s %s", Conf_Server[Conf_GetServer( Idx )].pwd_out, NGIRCd_ProtoID );
 		return Conn_WriteStr( Idx, "SERVER %s :%s", Conf_ServerName, Conf_ServerInfo );
 	}
 
@@ -1152,6 +878,9 @@ New_Connection( INT Sock )
 	/* Neue Client-Verbindung von Listen-Socket annehmen und
 	 * CLIENT-Struktur anlegen. */
 
+#ifdef USE_TCPWRAP
+	struct request_info req;
+#endif
 	struct sockaddr_in new_addr;
 	INT new_sock, new_sock_len;
 	RES_STAT *s;
@@ -1170,6 +899,19 @@ New_Connection( INT Sock )
 		Log( LOG_CRIT, "Can't accept connection: %s!", strerror( errno ));
 		return;
 	}
+	
+#ifdef USE_TCPWRAP
+	/* Validate socket using TCP Wrappers */
+	request_init( &req, RQ_DAEMON, PACKAGE_NAME, RQ_FILE, new_sock, RQ_CLIENT_SIN, &new_addr, NULL );
+	if( ! hosts_access( &req ))
+	{
+		/* Access denied! */
+		Log( deny_severity, "Refused connection from %s (by TCP Wrappers)!", inet_ntoa( new_addr.sin_addr ));
+		Simple_Message( new_sock, "ERROR :Connection refused" );
+		close( new_sock );
+		return;
+	}
+#endif
 
 	/* Socket initialisieren */
 	Init_Socket( new_sock );
@@ -1190,11 +932,19 @@ New_Connection( INT Sock )
 			{
 				/* Mehr Verbindungen duerfen wir leider nicht mehr annehmen ... */
 				Log( LOG_ALERT, "Can't accept connection: limit (%d) reached!", Pool_Size );
+				Simple_Message( new_sock, "ERROR :Connection limit reached" );
 				close( new_sock );
 				return;
 			}
 			if( new_size > Conf_MaxConnections ) new_size = Conf_MaxConnections;
 		}
+		if( new_size < Pool_Size )
+		{
+			Log( LOG_ALERT, "Can't accespt connection: limit (%d) reached -- overflow!", Pool_Size );
+			Simple_Message( new_sock, "ERROR :Connection limit reached" );
+			close( new_sock );
+			return;
+		}
 		
 		/* zunaechst realloc() versuchen; wenn das scheitert, malloc() versuchen
 		 * und Daten ggf. "haendisch" umkopieren. (Haesslich! Eine wirklich
@@ -1208,6 +958,7 @@ New_Connection( INT Sock )
 			{
 				/* Offenbar steht kein weiterer Sepeicher zur Verfuegung :-( */
 				Log( LOG_EMERG, "Can't allocate memory! [New_Connection]" );
+				Simple_Message( new_sock, "ERROR: Internal error" );
 				close( new_sock );
 				return;
 			}
@@ -1235,6 +986,7 @@ New_Connection( INT Sock )
 	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;
 	}
@@ -1483,7 +1235,7 @@ Check_Connections( VOID )
 	 * auch das nicht "hilft", Client disconnectieren. */
 
 	CLIENT *c;
-	LONG i;
+	CONN_ID i;
 
 	for( i = 0; i < Pool_Size; i++ )
 	{
@@ -1528,51 +1280,45 @@ Check_Connections( VOID )
 LOCAL VOID
 Check_Servers( VOID )
 {
-	/* Pruefen, ob Server-Verbindungen aufgebaut werden
-	 * muessen bzw. koennen */
+	/* Check if we can establish further server links */
 
 	RES_STAT *s;
-	LONG idx, n;
-	INT i;
-
-	/* Wenn "Passive-Mode" aktiv: nicht verbinden */
-	if( NGIRCd_Passive ) return;
+	CONN_ID idx;
+	INT i, n;
 
-	for( i = 0; i < Conf_Server_Count; i++ )
+	/* Serach all connections, are there results from the resolver? */
+	for( idx = 0; idx < Pool_Size; idx++ )
 	{
-		/* Ist ein Hostname und Port definiert? */
-		if(( ! Conf_Server[i].host[0] ) || ( ! Conf_Server[i].port > 0 )) continue;
+		if( My_Connections[idx].sock != SERVER_WAIT ) continue;
 
-		/* Haben wir schon eine Verbindung? */
-		for( n = 0; n < Pool_Size; n++ )
-		{
-			if( My_Connections[n].sock == NONE ) continue;
-			
-			/* Verbindung zu diesem Server? */
-			if( My_Connections[n].our_server == i )
-			{
-				/* Komplett aufgebaute Verbindung? */
-				if( My_Connections[n].sock > NONE ) break;
+		/* IP resolved? */
+		if( My_Connections[idx].res_stat == NULL ) New_Server( Conf_GetServer( idx ), idx );
+	}
 
-				/* IP schon aufgeloest? */
-				if( My_Connections[n].res_stat == NULL ) New_Server( i, n );
-			}
+	/* Check all configured servers */
+	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;
 
-			/* Verbindung in dieser Server-Gruppe? */
-			if(( My_Connections[n].our_server != NONE ) && ( Conf_Server[i].group != NONE ))
+		/* Is there already a connection in this group? */
+		if( Conf_Server[i].group > NONE )
+		{
+			for( n = 0; n < MAX_SERVERS; n++ )
 			{
-				if( Conf_Server[My_Connections[n].our_server].group == Conf_Server[i].group ) break;
+				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 < Pool_Size ) continue;
 
-		/* Wann war der letzte Connect-Versuch? */
+		/* Check last connect attempt? */
 		if( Conf_Server[i].lasttry > time( NULL ) - Conf_ConnectRetry ) continue;
 
-		/* Okay, Verbindungsaufbau versuchen */
+		/* Okay, try to connect now */
 		Conf_Server[i].lasttry = time( NULL );
 
-		/* Freie Connection-Struktur suschen */
+		/* Search free connection structure */
 		for( idx = 0; idx < Pool_Size; idx++ ) if( My_Connections[idx].sock == NONE ) break;
 		if( idx >= Pool_Size )
 		{
@@ -1584,11 +1330,10 @@ Check_Servers( VOID )
 		/* Verbindungs-Struktur initialisieren */
 		Init_Conn_Struct( idx );
 		My_Connections[idx].sock = SERVER_WAIT;
-		My_Connections[idx].our_server = i;
+		Conf_Server[i].conn_id = idx;
 
-		/* Hostnamen in IP aufloesen (Default bzw. im Fehlerfall: versuchen, den
-		 * konfigurierten Text direkt als IP-Adresse zu verwenden ... */
-		strlcpy( Conf_Server[My_Connections[idx].our_server].ip, Conf_Server[i].host, sizeof( Conf_Server[My_Connections[idx].our_server].ip ));
+		/* 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 );
 		if( s )
@@ -1689,7 +1434,7 @@ New_Server( INT Server, CONN_ID Idx )
 
 
 LOCAL VOID
-Init_Conn_Struct( LONG Idx )
+Init_Conn_Struct( CONN_ID Idx )
 {
 	/* Connection-Struktur initialisieren */
 
@@ -1700,7 +1445,6 @@ Init_Conn_Struct( LONG Idx )
 	My_Connections[Idx].rdatalen = 0;
 	My_Connections[Idx].wbuf[0] = '\0';
 	My_Connections[Idx].wdatalen = 0;
-	My_Connections[Idx].our_server = NONE;
 	My_Connections[Idx].starttime = time( NULL );
 	My_Connections[Idx].lastdata = time( NULL );
 	My_Connections[Idx].lastping = 0;
@@ -1757,7 +1501,7 @@ Read_Resolver_Result( INT r_fd )
 
 	CHAR result[HOST_LEN];
 	CLIENT *c;
-	INT len, i;
+	INT len, i, n;
 
 	FD_CLR( r_fd, &Resolver_FDs );
 
@@ -1805,8 +1549,9 @@ Read_Resolver_Result( INT r_fd )
 	else
 	{
 		/* Ausgehende Verbindung (=Server): IP setzen */
-		assert( My_Connections[i].our_server > NONE );
-		strlcpy( Conf_Server[My_Connections[i].our_server].ip, result, sizeof( Conf_Server[My_Connections[i].our_server].ip ));
+		n = Conf_GetServer( i );
+		if( n > NONE ) strlcpy( Conf_Server[n].ip, result, sizeof( Conf_Server[n].ip ));
+		else Log( LOG_ERR, "Got resolver result for non-configured server!?" );
 	}
 
 	/* Penalty-Zeit zurueck setzen */
@@ -1814,115 +1559,19 @@ Read_Resolver_Result( INT r_fd )
 } /* Read_Resolver_Result */
 
 
-#ifdef USE_ZLIB
-
-LOCAL BOOLEAN
-Zip_Buffer( CONN_ID Idx, CHAR *Data, INT Len )
-{
-	/* Daten zum Komprimieren im "Kompressions-Puffer" sammeln.
-	 * Es wird TRUE bei Erfolg, sonst FALSE geliefert. */
-
-	assert( Idx > NONE );
-	assert( Data != NULL );
-	assert( Len > 0 );
-
-	/* Ist noch Platz im Kompressions-Puffer? */
-	if( ZWRITEBUFFER_LEN - My_Connections[Idx].zip.wdatalen < Len + 50 )
-	{
-		/* Nein! Puffer zunaechst leeren ...*/
-		if( ! Zip_Flush( Idx )) return FALSE;
-	}
-
-	/* Daten kopieren */
-	memmove( My_Connections[Idx].zip.wbuf + My_Connections[Idx].zip.wdatalen, Data, Len );
-	My_Connections[Idx].zip.wdatalen += Len;
-
-	return TRUE;
-} /* Zip_Buffer */
-
-
-LOCAL BOOLEAN
-Zip_Flush( CONN_ID Idx )
-{
-	/* Daten komprimieren und in Schreibpuffer kopieren.
-	 * Es wird TRUE bei Erfolg, sonst FALSE geliefert. */
-
-	INT result, out_len;
-	z_stream *out;
-
-	out = &My_Connections[Idx].zip.out;
-
-	out->next_in = My_Connections[Idx].zip.wbuf;
-	out->avail_in = My_Connections[Idx].zip.wdatalen;
-	out->next_out = My_Connections[Idx].wbuf + My_Connections[Idx].wdatalen;
-	out->avail_out = WRITEBUFFER_LEN - My_Connections[Idx].wdatalen;
-
-	result = deflate( out, Z_SYNC_FLUSH );
-	if(( result != Z_OK ) || ( out->avail_in > 0 ))
-	{
-		Log( LOG_ALERT, "Compression error: code %d!?", result );
-		Conn_Close( Idx, "Compression error!", NULL, FALSE );
-		return FALSE;
-	}
-
-	out_len = WRITEBUFFER_LEN - My_Connections[Idx].wdatalen - out->avail_out;
-	My_Connections[Idx].wdatalen += out_len;
-	My_Connections[Idx].bytes_out += out_len;
-	My_Connections[Idx].zip.bytes_out += My_Connections[Idx].zip.wdatalen;
-	My_Connections[Idx].zip.wdatalen = 0;
-	
-	return TRUE;
-} /* Zip_Flush */
-
-
-LOCAL BOOLEAN
-Unzip_Buffer( CONN_ID Idx )
+LOCAL VOID
+Simple_Message( INT Sock, CHAR *Msg )
 {
-	/* Daten entpacken und in Lesepuffer kopieren. Bei Fehlern
-	 * wird FALSE geliefert, ansonsten TRUE. Der Fall, dass keine
-	 * Daten mehr zu entpacken sind, ist _kein_ Fehler! */
-
-	INT result, in_len, out_len;
-	z_stream *in;
-
-	assert( Idx > NONE );
-
-	if( My_Connections[Idx].zip.rdatalen <= 0 ) return TRUE;
-
-	in = &My_Connections[Idx].zip.in;
-
-	in->next_in = My_Connections[Idx].zip.rbuf;
-	in->avail_in = My_Connections[Idx].zip.rdatalen;
-	in->next_out = My_Connections[Idx].rbuf + My_Connections[Idx].rdatalen;
-	in->avail_out = READBUFFER_LEN - My_Connections[Idx].rdatalen - 1;
-
-	result = inflate( in, Z_SYNC_FLUSH );
-	if( result != Z_OK )
-	{
-		Log( LOG_ALERT, "Decompression error: code %d (ni=%d, ai=%d, no=%d, ao=%d)!?", result, in->next_in, in->avail_in, in->next_out, in->avail_out );
-		Conn_Close( Idx, "Decompression error!", NULL, FALSE );
-		return FALSE;
-	}
-
-	in_len = My_Connections[Idx].zip.rdatalen - in->avail_in;
-	out_len = READBUFFER_LEN - My_Connections[Idx].rdatalen - 1 - in->avail_out;
-	My_Connections[Idx].rdatalen += out_len;
-
-	if( in->avail_in > 0 )
-	{
-		/* es konnten nicht alle Daten entpackt werden, vermutlich war
-		 * im Ziel-Puffer kein Platz mehr. Umkopieren ... */
-		My_Connections[Idx].zip.rdatalen -= in_len;
-		memmove( My_Connections[Idx].zip.rbuf, My_Connections[Idx].zip.rbuf + in_len, My_Connections[Idx].zip.rdatalen );
-	}
-	else My_Connections[Idx].zip.rdatalen = 0;
-	My_Connections[Idx].zip.bytes_in += out_len;
-
-	return TRUE;
-} /* Unzip_Buffer */
+	/* Write "simple" message to socket, without using compression
+	 * or even the connection write buffers. Used e.g. for error
+	 * messages by New_Connection(). */
 
+	assert( Sock > NONE );
+	assert( Msg != NULL );
 
-#endif
+	(VOID)send( Sock, Msg, strlen( Msg ), 0 );
+	(VOID)send( Sock, "\r\n", 2, 0 );
+} /* Simple_Error */
 
 
 /* -eof- */