X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconn.c;h=89f0ae66b024ca4070430a8aa6792a31392c8746;hp=4b48ffb842288c62f1265ef3ea7507debb3e89e4;hb=83194a23a30de5712375e10366bbd4f7b5b3e0c2;hpb=439c945d56ecba14cce789c5725575667c066502

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 4b48ffb8..89f0ae66 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -16,7 +16,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conn.c,v 1.118 2003/03/07 14:35:52 alex Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.123 2003/04/25 16:47:52 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -86,6 +86,7 @@ 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 ));
+LOCAL VOID Simple_Message PARAMS(( INT Sock, CHAR *Msg ));
 
 LOCAL fd_set My_Listeners;
 LOCAL fd_set My_Sockets;
@@ -150,7 +151,7 @@ Conn_Exit( VOID )
 #ifdef RENDEZVOUS
 	Rendezvous_UnregisterListeners( );
 #endif
-	
+
 	/* Sockets schliessen */
 	for( i = 0; i < Conn_MaxFD + 1; i++ )
 	{
@@ -182,7 +183,7 @@ Conn_Exit( VOID )
 			}
 		}
 	}
-	
+
 	free( My_Connections );
 	My_Connections = NULL;
 	Pool_Size = 0;
@@ -216,7 +217,7 @@ Conn_ExitListeners( VOID )
 #ifdef RENDEZVOUS
 	Rendezvous_UnregisterListeners( );
 #endif
-	
+
 	Log( LOG_INFO, "Shutting down all listening sockets ..." );
 	for( i = 0; i < Conn_MaxFD + 1; i++ )
 	{
@@ -239,7 +240,7 @@ Conn_NewListener( CONST UINT Port )
 #ifdef RENDEZVOUS
 	CHAR name[CLIENT_ID_LEN], *info;
 #endif
-	
+
 	/* Server-"Listen"-Socket initialisieren */
 	memset( &addr, 0, sizeof( addr ));
 	addr.sin_family = AF_INET;
@@ -414,7 +415,7 @@ Conn_Handler( VOID )
 		tv.tv_usec = 0;
 		if( timeout ) tv.tv_sec = TIME_RES;
 		else tv.tv_sec = 0;
-		
+
 		/* Auf Aktivitaet warten */
 		i = select( Conn_MaxFD + 1, &read_sockets, &write_sockets, NULL, &tv );
 		if( i == 0 )
@@ -428,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;
@@ -442,7 +443,7 @@ Conn_Handler( VOID )
 			/* Es kann geschrieben werden ... */
 			idx = Socket2Index( i );
 			if( idx == NONE ) continue;
-			
+
 			if( ! Handle_Write( idx ))
 			{
 				/* Fehler beim Schreiben! Diesen Socket nun
@@ -625,7 +626,7 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )
 	{
 		/* 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 );
+		Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
 		exit( 1 );
 	}
 
@@ -682,6 +683,37 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )
 } /* Conn_Close */
 
 
+GLOBAL VOID
+Conn_SyncServerStruct( VOID )
+{
+	/* Synchronize server structures (connection IDs):
+	 * connections <-> configuration */
+
+	CLIENT *client;
+	CONN_ID i;
+	INT c;
+
+	for( i = 0; i < Pool_Size; i++ )
+	{
+		/* Established connection? */
+		if( My_Connections[i].sock <= NONE ) continue;
+
+		/* Server connection? */
+		client = Client_GetFromConn( i );
+		if(( ! client ) || ( Client_Type( client ) != CLIENT_SERVER )) continue;
+
+		for( c = 0; c < MAX_SERVERS; c++ )
+		{
+			/* Configured server? */
+			if( ! Conf_Server[c].host[0] ) continue;
+
+			/* Duplicate? */
+			if( strcmp( Conf_Server[c].name, Client_ID( client )) == 0 ) Conf_Server[c].conn_id = i;
+		}
+	}
+} /* SyncServerStruct */
+
+
 LOCAL BOOLEAN
 Try_Write( CONN_ID Idx )
 {
@@ -766,6 +798,7 @@ 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 );
@@ -779,9 +812,9 @@ 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 ))
@@ -866,14 +899,15 @@ 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, RQ_FILE, new_sock, RQ_CLIENT_SIN, &new_addr, NULL );
+	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;
 	}
@@ -887,10 +921,10 @@ New_Connection( INT Sock )
 	if( idx >= Pool_Size )
 	{
 		new_size = Pool_Size + CONNECTION_POOL;
-		
+
 		/* Im bisherigen Pool wurde keine freie Connection-Struktur mehr gefunden.
 		 * Wenn erlaubt und moeglich muss nun der Pool vergroessert werden: */
-		
+
 		if( Conf_MaxConnections > 0 )
 		{
 			/* Es ist ein Limit konfiguriert */
@@ -898,6 +932,7 @@ 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;
 			}
@@ -906,10 +941,11 @@ New_Connection( INT Sock )
 		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
 		 * dynamische Verwaltung waere wohl _deutlich_ besser ...) */
@@ -922,24 +958,25 @@ 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;
 			}
-			
+
 			/* Struktur umkopieren ... */
 			memcpy( ptr, My_Connections, sizeof( CONNECTION ) * Pool_Size );
-			
+
 			Log( LOG_DEBUG, "Allocated new connection pool for %ld items (%ld bytes). [malloc()/memcpy()]", new_size, sizeof( CONNECTION ) * new_size );
 		}
 		else Log( LOG_DEBUG, "Allocated new connection pool for %ld items (%ld bytes). [realloc()]", new_size, sizeof( CONNECTION ) * new_size );
-		
+
 		/* Adjust pointer to new block */
 		My_Connections = ptr;
-		
+
 		/* Initialize new items */
 		for( idx = Pool_Size; idx < new_size; idx++ ) Init_Conn_Struct( idx );
 		idx = Pool_Size;
-		
+
 		/* Adjust new pool size */
 		Pool_Size = new_size;
 	}
@@ -949,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;
 	}
@@ -973,7 +1011,7 @@ New_Connection( INT Sock )
 		/* Sub-Prozess wurde asyncron gestartet */
 		My_Connections[idx].res_stat = s;
 	}
-	
+
 	/* Penalty-Zeit setzen */
 	Conn_SetPenalty( idx, 4 );
 } /* New_Connection */
@@ -1104,14 +1142,14 @@ Handle_Buffer( CONN_ID Idx )
 			if( ! Unzip_Buffer( Idx )) return FALSE;
 		}
 #endif
-	
+
 		if( My_Connections[Idx].rdatalen < 1 ) break;
 
 		/* Eine komplette Anfrage muss mit CR+LF enden, vgl.
 		 * RFC 2812. Haben wir eine? */
 		My_Connections[Idx].rbuf[My_Connections[Idx].rdatalen] = '\0';
 		ptr = strstr( My_Connections[Idx].rbuf, "\r\n" );
-	
+
 		if( ptr ) delta = 2;
 #ifndef STRICT_RFC
 		else
@@ -1126,7 +1164,7 @@ Handle_Buffer( CONN_ID Idx )
 			else if( ptr2 ) ptr = ptr2;
 		}
 #endif
-	
+
 		action = FALSE;
 		if( ptr )
 		{
@@ -1181,10 +1219,10 @@ Handle_Buffer( CONN_ID Idx )
 			}
 #endif
 		}
-		
+
 		if( action ) result = TRUE;
 	} while( action );
-	
+
 	return result;
 } /* Handle_Buffer */
 
@@ -1310,7 +1348,7 @@ Check_Servers( VOID )
 LOCAL VOID
 New_Server( INT Server, CONN_ID Idx )
 {
-	/* Neue Server-Verbindung aufbauen */
+	/* Establish new server link */
 
 	struct sockaddr_in new_addr;
 	struct in_addr inaddr;
@@ -1320,11 +1358,12 @@ New_Server( INT Server, CONN_ID Idx )
 	assert( Server > NONE );
 	assert( Idx > NONE );
 
-	/* Wurde eine gueltige IP-Adresse gefunden? */
+	/* Did we get a valid IP address? */
 	if( ! Conf_Server[Server].ip[0] )
 	{
-		/* Nein. Verbindung wieder freigeben: */
+		/* 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;
 	}
@@ -1339,8 +1378,9 @@ New_Server( INT Server, CONN_ID Idx )
 	if( inaddr.s_addr == (unsigned)-1 )
 #endif
 	{
-		/* Konnte Adresse nicht konvertieren */
+		/* 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;
 	}
@@ -1353,7 +1393,9 @@ New_Server( INT Server, CONN_ID Idx )
 	new_sock = socket( PF_INET, SOCK_STREAM, 0 );
 	if ( new_sock < 0 )
 	{
+		/* Can't create socket */
 		Init_Conn_Struct( Idx );
+		Conf_Server[Server].conn_id = NONE;
 		Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
 		return;
 	}
@@ -1363,9 +1405,11 @@ New_Server( INT Server, CONN_ID Idx )
 	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 );
 		Init_Conn_Struct( Idx );
+		Conf_Server[Server].conn_id = NONE;
 		return;
 	}
 
@@ -1373,24 +1417,26 @@ New_Server( INT Server, CONN_ID Idx )
 	c = Client_NewLocal( Idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWNSERVER, FALSE );
 	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;
 	}
 	Client_SetIntroducer( c, c );
 	Client_SetToken( c, TOKEN_OUTBOUND );
 
-	/* Verbindung registrieren */
+	/* 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 ));
 
-	/* Neuen Socket registrieren */
+	/* Register new socket */
 	FD_SET( new_sock, &My_Sockets );
 	FD_SET( new_sock, &My_Connects );
 	if( new_sock > Conn_MaxFD ) Conn_MaxFD = new_sock;
-	
+
 	Log( LOG_DEBUG, "Registered new connection %d on socket %d.", Idx, My_Connections[Idx].sock );
 } /* New_Server */
 
@@ -1493,7 +1539,7 @@ Read_Resolver_Result( INT r_fd )
 	}
 
 	Log( LOG_DEBUG, "Resolver: %s is \"%s\".", My_Connections[i].host, result );
-	
+
 	/* Aufraeumen */
 	close( My_Connections[i].res_stat->pipe[0] );
 	close( My_Connections[i].res_stat->pipe[1] );
@@ -1521,4 +1567,19 @@ Read_Resolver_Result( INT r_fd )
 } /* Read_Resolver_Result */
 
 
+LOCAL VOID
+Simple_Message( INT Sock, CHAR *Msg )
+{
+	/* 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 );
+
+	(VOID)send( Sock, Msg, strlen( Msg ), 0 );
+	(VOID)send( Sock, "\r\n", 2, 0 );
+} /* Simple_Error */
+
+
 /* -eof- */