X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fconn.c;h=ba874f8a71bd5f57b9b13595677494f88c6b9d80;hb=1d08d51e2eaff14b71f20d3f0898d5a86582b7e5;hp=d35a091791893ac6eb071c3b9f3a1a326ca69c95;hpb=c3dfd63bf3213a5a68d890d3e7cb38fe94a55cb6;p=ngircd-alex.git diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index d35a0917..ba874f8a 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2004 Alexander Barton * * 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 @@ -16,11 +16,15 @@ #include "portab.h" -static char UNUSED id[] = "$Id: conn.c,v 1.122 2003/04/21 10:52:26 alex Exp $"; +static char UNUSED id[] = "$Id: conn.c,v 1.143 2005/01/19 23:33:54 alex Exp $"; #include "imp.h" #include -#include +#ifdef PROTOTYPES +# include +#else +# include +#endif #include #include #include @@ -33,18 +37,22 @@ static char UNUSED id[] = "$Id: conn.c,v 1.122 2003/04/21 10:52:26 alex Exp $"; #include #include +#ifdef HAVE_NETINET_IP_H +# include +#endif + #ifdef HAVE_ARPA_INET_H -#include +# include #else -#define PF_INET AF_INET +# define PF_INET AF_INET #endif #ifdef HAVE_STDINT_H -#include /* e.g. for Mac OS X */ +# include /* e.g. for Mac OS X */ #endif -#ifdef USE_TCPWRAP -#include /* for TCP Wrappers */ +#ifdef TCPWRAP +# include /* for TCP Wrappers */ #endif #include "defines.h" @@ -64,7 +72,7 @@ static char UNUSED id[] = "$Id: conn.c,v 1.122 2003/04/21 10:52:26 alex Exp $"; #include "tool.h" #ifdef RENDEZVOUS -#include "rendezvous.h" +# include "rendezvous.h" #endif #include "exp.h" @@ -87,12 +95,13 @@ 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 INT Count_Connections PARAMS(( struct sockaddr_in addr )); LOCAL fd_set My_Listeners; LOCAL fd_set My_Sockets; LOCAL fd_set My_Connects; -#ifdef USE_TCPWRAP +#ifdef TCPWRAP INT allow_severity = LOG_INFO; INT deny_severity = LOG_ERR; #endif @@ -112,14 +121,16 @@ Conn_Init( VOID ) /* konfiguriertes Limit beachten */ if( Pool_Size > Conf_MaxConnections ) Pool_Size = Conf_MaxConnections; } - My_Connections = malloc( sizeof( CONNECTION ) * Pool_Size ); + My_Connections = (CONNECTION *)malloc( sizeof( CONNECTION ) * Pool_Size ); if( ! My_Connections ) { /* Speicher konnte nicht alloziert werden! */ Log( LOG_EMERG, "Can't allocate memory! [Conn_Init]" ); exit( 1 ); } - Log( LOG_DEBUG, "Allocted connection pool for %d items (%ld bytes).", Pool_Size, sizeof( CONNECTION ) * Pool_Size ); +#ifdef DEBUG + Log( LOG_DEBUG, "Allocated connection pool for %d items (%ld bytes).", Pool_Size, sizeof( CONNECTION ) * Pool_Size ); +#endif /* zu Beginn haben wir keine Verbindungen */ FD_ZERO( &My_Listeners ); @@ -146,12 +157,14 @@ Conn_Exit( VOID ) CONN_ID idx; INT i; +#ifdef DEBUG Log( LOG_DEBUG, "Shutting down all connections ..." ); +#endif #ifdef RENDEZVOUS Rendezvous_UnregisterListeners( ); #endif - + /* Sockets schliessen */ for( i = 0; i < Conn_MaxFD + 1; i++ ) { @@ -164,12 +177,16 @@ Conn_Exit( VOID ) if( FD_ISSET( i, &My_Listeners )) { close( i ); +#ifdef DEBUG Log( LOG_DEBUG, "Listening socket %d closed.", i ); +#endif } else if( FD_ISSET( i, &My_Connects )) { close( i ); +#ifdef DEBUG Log( LOG_DEBUG, "Connection %d closed during creation (socket %d).", idx, i ); +#endif } else if( idx < Pool_Size ) { @@ -183,7 +200,7 @@ Conn_Exit( VOID ) } } } - + free( My_Connections ); My_Connections = NULL; Pool_Size = 0; @@ -217,14 +234,16 @@ Conn_ExitListeners( VOID ) #ifdef RENDEZVOUS Rendezvous_UnregisterListeners( ); #endif - + Log( LOG_INFO, "Shutting down all listening sockets ..." ); for( i = 0; i < Conn_MaxFD + 1; i++ ) { if( FD_ISSET( i, &My_Sockets ) && FD_ISSET( i, &My_Listeners )) { close( i ); +#ifdef DEBUG Log( LOG_DEBUG, "Listening socket %d closed.", i ); +#endif } } } /* Conn_ExitListeners */ @@ -236,16 +255,32 @@ Conn_NewListener( CONST UINT Port ) /* Create new listening socket on specified port */ struct sockaddr_in addr; + struct in_addr inaddr; INT sock; #ifdef RENDEZVOUS CHAR name[CLIENT_ID_LEN], *info; #endif - + /* Server-"Listen"-Socket initialisieren */ memset( &addr, 0, sizeof( addr )); + memset( &inaddr, 0, sizeof( inaddr )); addr.sin_family = AF_INET; addr.sin_port = htons( Port ); - addr.sin_addr.s_addr = htonl( INADDR_ANY ); + if( Conf_ListenAddress[0] ) + { +#ifdef HAVE_INET_ATON + if( inet_aton( Conf_ListenAddress, &inaddr ) == 0 ) +#else + inaddr.s_addr = inet_addr( Conf_ListenAddress ); + if( inaddr.s_addr == (unsigned)-1 ) +#endif + { + Log( LOG_CRIT, "Can't listen on %s:%u: can't convert ip address %s!", Conf_ListenAddress, Port, Conf_ListenAddress ); + return FALSE; + } + } + else inaddr.s_addr = htonl( INADDR_ANY ); + addr.sin_addr = inaddr; /* Socket erzeugen */ sock = socket( PF_INET, SOCK_STREAM, 0); @@ -279,7 +314,8 @@ Conn_NewListener( CONST UINT Port ) if( sock > Conn_MaxFD ) Conn_MaxFD = sock; - Log( LOG_INFO, "Now listening on port %d (socket %d).", Port, sock ); + 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 ); #ifdef RENDEZVOUS /* Get best server description text */ @@ -350,10 +386,13 @@ Conn_Handler( VOID ) Check_Servers( ); Check_Connections( ); + t = time( NULL ); + /* noch volle Lese-Buffer suchen */ for( i = 0; i < Pool_Size; i++ ) { - if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].rdatalen > 0 )) + if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].rdatalen > 0 ) && + ( My_Connections[i].delaytime < t )) { /* Kann aus dem Buffer noch ein Befehl extrahiert werden? */ if( Handle_Buffer( i )) timeout = FALSE; @@ -364,7 +403,7 @@ Conn_Handler( VOID ) FD_ZERO( &write_sockets ); for( i = 0; i < Pool_Size; i++ ) { -#ifdef USE_ZLIB +#ifdef ZLIB if(( My_Connections[i].sock > NONE ) && (( My_Connections[i].wdatalen > 0 ) || ( My_Connections[i].zip.wdatalen > 0 ))) #else if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].wdatalen > 0 )) @@ -382,7 +421,6 @@ Conn_Handler( VOID ) } /* von welchen Sockets koennte gelesen werden? */ - t = time( NULL ); read_sockets = My_Sockets; for( i = 0; i < Pool_Size; i++ ) { @@ -413,9 +451,9 @@ Conn_Handler( VOID ) /* Timeout initialisieren */ tv.tv_usec = 0; - if( timeout ) tv.tv_sec = TIME_RES; + if( timeout ) tv.tv_sec = 1; else tv.tv_sec = 0; - + /* Auf Aktivitaet warten */ i = select( Conn_MaxFD + 1, &read_sockets, &write_sockets, NULL, &tv ); if( i == 0 ) @@ -443,7 +481,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 @@ -491,7 +529,7 @@ va_dcl #else va_start( ap ); #endif - if( vsnprintf( buffer, COMMAND_LEN - 2, Format, ap ) == COMMAND_LEN - 2 ) + if( vsnprintf( buffer, COMMAND_LEN - 2, Format, ap ) >= COMMAND_LEN - 2 ) { Log( LOG_CRIT, "Text too long to send (connection %d)!", Idx ); Conn_Close( Idx, "Text too long to send!", NULL, FALSE ); @@ -527,7 +565,9 @@ Conn_Write( CONN_ID Idx, CHAR *Data, INT Len ) * In diesem Fall wird hier einfach ein Fehler geliefert. */ if( My_Connections[Idx].sock <= NONE ) { +#ifdef DEBUG Log( LOG_DEBUG, "Skipped write on closed socket (connection %d).", Idx ); +#endif return FALSE; } @@ -549,7 +589,7 @@ Conn_Write( CONN_ID Idx, CHAR *Data, INT Len ) } } -#ifdef USE_ZLIB +#ifdef ZLIB if( My_Connections[Idx].options & CONN_ZIP ) { /* Daten komprimieren und in Puffer kopieren */ @@ -578,25 +618,36 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient ) * sub-processes are closed down. */ CLIENT *c; + CHAR *txt; DOUBLE in_k, out_k; -#ifdef USE_ZLIB +#ifdef ZLIB DOUBLE in_z_k, out_z_k; INT in_p, out_p; #endif 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. */ +#ifdef DEBUG + Log( LOG_DEBUG, "Recursive request to close connection: %d", Idx ); +#endif return; } + assert( My_Connections[Idx].sock > NONE ); + /* Mark link as "closing" */ My_Connections[Idx].options |= CONN_ISCLOSING; + + if( LogMsg ) txt = LogMsg; + else txt = FwdMsg; + if( ! txt ) txt = "Reason unknown"; + + Log( LOG_INFO, "Shutting down connection %d (%s) with %s:%d ...", Idx, LogMsg ? LogMsg : FwdMsg, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port )); /* Search client, if any */ c = Client_GetFromConn( Idx ); @@ -615,7 +666,6 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient ) /* 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; } /* Try to write out the write buffer */ @@ -641,7 +691,7 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient ) /* 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 +#ifdef ZLIB if( My_Connections[Idx].options & CONN_ZIP ) { in_z_k = (DOUBLE)My_Connections[Idx].zip.bytes_in / 1024; @@ -669,7 +719,7 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient ) /* Servers: Modify time of next connect attempt? */ Conf_UnsetServer( Idx ); -#ifdef USE_ZLIB +#ifdef ZLIB /* Clean up zlib, if link was compressed */ if( Conn_Options( Idx ) & CONN_ZIP ) { @@ -680,6 +730,10 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient ) /* Clean up connection structure (=free it) */ Init_Conn_Struct( Idx ); + +#ifdef DEBUG + Log( LOG_DEBUG, "Shutdown of connection %d completed.", Idx ); +#endif } /* Conn_Close */ @@ -730,7 +784,7 @@ Try_Write( CONN_ID Idx ) assert( My_Connections[Idx].sock > NONE ); /* sind ueberhaupt Daten vorhanden? */ -#ifdef USE_ZLIB +#ifdef ZLIB if(( ! My_Connections[Idx].wdatalen > 0 ) && ( ! My_Connections[Idx].zip.wdatalen )) return TRUE; #else if( ! My_Connections[Idx].wdatalen > 0 ) return TRUE; @@ -836,14 +890,14 @@ Handle_Write( CONN_ID Idx ) return FALSE; } - 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 ); + Log( LOG_INFO, "Connection %d with \"%s:%d\" established. Now logging in ...", Idx, My_Connections[Idx].host, Conf_Server[Conf_GetServer( Idx )].port ); - /* PASS und SERVER verschicken */ + /* Send PASS and SERVER command to peer */ 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 ); } -#ifdef USE_ZLIB +#ifdef ZLIB /* Schreibpuffer leer, aber noch Daten im Kompressionsbuffer? * Dann muss dieser nun geflushed werden! */ if( My_Connections[Idx].wdatalen == 0 ) Zip_Flush( Idx ); @@ -878,7 +932,7 @@ New_Connection( INT Sock ) /* Neue Client-Verbindung von Listen-Socket annehmen und * CLIENT-Struktur anlegen. */ -#ifdef USE_TCPWRAP +#ifdef TCPWRAP struct request_info req; #endif struct sockaddr_in new_addr; @@ -887,7 +941,7 @@ New_Connection( INT Sock ) CONN_ID idx; CLIENT *c; POINTER *ptr; - LONG new_size; + LONG new_size, cnt; assert( Sock > NONE ); @@ -899,10 +953,11 @@ New_Connection( INT Sock ) Log( LOG_CRIT, "Can't accept connection: %s!", strerror( errno )); return; } - -#ifdef USE_TCPWRAP + +#ifdef TCPWRAP /* Validate socket using TCP Wrappers */ request_init( &req, RQ_DAEMON, PACKAGE_NAME, RQ_FILE, new_sock, RQ_CLIENT_SIN, &new_addr, NULL ); + fromhost(&req); if( ! hosts_access( &req )) { /* Access denied! */ @@ -915,16 +970,27 @@ New_Connection( INT Sock ) /* Socket initialisieren */ Init_Socket( new_sock ); + + /* Check IP-based connection limit */ + cnt = Count_Connections( new_addr ); + if(( Conf_MaxConnectionsIP > 0 ) && ( cnt >= Conf_MaxConnectionsIP )) + { + /* Access denied, too many connections from this IP address! */ + 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; + } /* Freie Connection-Struktur suchen */ for( idx = 0; idx < Pool_Size; idx++ ) if( My_Connections[idx].sock == NONE ) break; if( idx >= Pool_Size ) { new_size = Pool_Size + CONNECTION_POOL; - + /* Im bisherigen Pool wurde keine freie Connection-Struktur mehr gefunden. * Wenn erlaubt und moeglich muss nun der Pool vergroessert werden: */ - + if( Conf_MaxConnections > 0 ) { /* Es ist ein Limit konfiguriert */ @@ -945,38 +1011,27 @@ New_Connection( INT Sock ) 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 ...) */ - ptr = realloc( My_Connections, sizeof( CONNECTION ) * new_size ); + + ptr = (POINTER *)realloc( My_Connections, sizeof( CONNECTION ) * new_size ); if( ! ptr ) { - /* realloc() ist fehlgeschlagen. Nun malloc() probieren: */ - ptr = malloc( sizeof( CONNECTION ) * new_size ); - if( ! ptr ) - { - /* 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 ); + Log( LOG_EMERG, "Can't allocate memory! [New_Connection]" ); + Simple_Message( new_sock, "ERROR: Internal error" ); + close( new_sock ); + return; } - else Log( LOG_DEBUG, "Allocated new connection pool for %ld items (%ld bytes). [realloc()]", new_size, sizeof( CONNECTION ) * new_size ); - + +#ifdef DEBUG + Log( LOG_DEBUG, "Allocated new connection pool for %ld items (%ld bytes). [realloc()]", new_size, sizeof( CONNECTION ) * new_size ); +#endif + /* Adjust pointer to new block */ - My_Connections = ptr; - + My_Connections = (CONNECTION *)ptr; + /* Initialize new items */ for( idx = Pool_Size; idx < new_size; idx++ ) Init_Conn_Struct( idx ); idx = Pool_Size; - + /* Adjust new pool size */ Pool_Size = new_size; } @@ -1005,13 +1060,17 @@ New_Connection( INT 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 if( s ) { /* Sub-Prozess wurde asyncron gestartet */ My_Connections[idx].res_stat = s; } - + /* Penalty-Zeit setzen */ Conn_SetPenalty( idx, 4 ); } /* New_Connection */ @@ -1032,7 +1091,9 @@ Socket2Index( INT Sock ) { /* die Connection wurde vermutlich (wegen eines * Fehlers) bereits wieder abgebaut ... */ +#ifdef DEBUG Log( LOG_DEBUG, "Socket2Index: can't get connection for socket %d!", Sock ); +#endif return NONE; } else return idx; @@ -1046,7 +1107,7 @@ Read_Request( CONN_ID Idx ) * Tritt ein Fehler auf, so wird der Socket geschlossen. */ INT len, bsize; -#ifdef USE_ZLIB +#ifdef ZLIB CLIENT *c; #endif @@ -1056,24 +1117,24 @@ Read_Request( CONN_ID Idx ) /* wenn noch nicht registriert: maximal mit ZREADBUFFER_LEN arbeiten, * ansonsten koennen Daten ggf. nicht umkopiert werden. */ bsize = READBUFFER_LEN; -#ifdef USE_ZLIB +#ifdef ZLIB c = Client_GetFromConn( Idx ); if(( Client_Type( c ) != CLIENT_USER ) && ( Client_Type( c ) != CLIENT_SERVER ) && ( Client_Type( c ) != CLIENT_SERVICE ) && ( bsize > ZREADBUFFER_LEN )) bsize = ZREADBUFFER_LEN; #endif -#ifdef USE_ZLIB +#ifdef ZLIB if(( bsize - My_Connections[Idx].rdatalen - 1 < 1 ) || ( ZREADBUFFER_LEN - My_Connections[Idx].zip.rdatalen < 1 )) #else if( bsize - My_Connections[Idx].rdatalen - 1 < 1 ) #endif { /* Der Lesepuffer ist voll */ - Log( LOG_ERR, "Read buffer overflow (connection %d): %d bytes!", Idx, My_Connections[Idx].rdatalen ); - Conn_Close( Idx, "Read buffer overflow!", NULL, FALSE ); + Log( LOG_ERR, "Receive buffer overflow (connection %d): %d bytes!", Idx, My_Connections[Idx].rdatalen ); + Conn_Close( Idx, "Receive buffer overflow!", NULL, FALSE ); return; } -#ifdef USE_ZLIB +#ifdef ZLIB if( My_Connections[Idx].options & CONN_ZIP ) { len = recv( My_Connections[Idx].sock, My_Connections[Idx].zip.rbuf + My_Connections[Idx].zip.rdatalen, ( ZREADBUFFER_LEN - My_Connections[Idx].zip.rdatalen ), 0 ); @@ -1128,28 +1189,31 @@ Handle_Buffer( CONN_ID Idx ) CHAR *ptr; INT len, delta; BOOLEAN action, result; -#ifdef USE_ZLIB +#ifdef ZLIB BOOLEAN old_z; #endif result = FALSE; do { -#ifdef USE_ZLIB + /* Check penalty */ + if( My_Connections[Idx].delaytime > time( NULL )) return result; + +#ifdef ZLIB /* ggf. noch unkomprimiete Daten weiter entpacken */ if( My_Connections[Idx].options & CONN_ZIP ) { 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 @@ -1164,7 +1228,7 @@ Handle_Buffer( CONN_ID Idx ) else if( ptr2 ) ptr = ptr2; } #endif - + action = FALSE; if( ptr ) { @@ -1181,7 +1245,7 @@ Handle_Buffer( CONN_ID Idx ) return FALSE; } -#ifdef USE_ZLIB +#ifdef ZLIB /* merken, ob Stream bereits komprimiert wird */ old_z = My_Connections[Idx].options & CONN_ZIP; #endif @@ -1198,31 +1262,31 @@ Handle_Buffer( CONN_ID Idx ) My_Connections[Idx].rdatalen -= len; memmove( My_Connections[Idx].rbuf, My_Connections[Idx].rbuf + len, My_Connections[Idx].rdatalen ); -#ifdef USE_ZLIB +#ifdef ZLIB if(( ! old_z ) && ( My_Connections[Idx].options & CONN_ZIP ) && ( My_Connections[Idx].rdatalen > 0 )) { /* Mit dem letzten Befehl wurde Socket-Kompression aktiviert. * Evtl. schon vom Socket gelesene Daten in den Unzip-Puffer * umkopieren, damit diese nun zunaechst entkomprimiert werden */ + if( My_Connections[Idx].rdatalen > ZREADBUFFER_LEN ) { - if( My_Connections[Idx].rdatalen > ZREADBUFFER_LEN ) - { - /* Hupsa! Soviel Platz haben wir aber gar nicht! */ - Log( LOG_ALERT, "Can't move read buffer: No space left in unzip buffer (need %d bytes)!", My_Connections[Idx].rdatalen ); - return FALSE; - } - memcpy( My_Connections[Idx].zip.rbuf, My_Connections[Idx].rbuf, My_Connections[Idx].rdatalen ); - My_Connections[Idx].zip.rdatalen = My_Connections[Idx].rdatalen; - My_Connections[Idx].rdatalen = 0; - Log( LOG_DEBUG, "Moved already received data (%d bytes) to uncompression buffer.", My_Connections[Idx].zip.rdatalen ); + /* Hupsa! Soviel Platz haben wir aber gar nicht! */ + Log( LOG_ALERT, "Can't move receive buffer: No space left in unzip buffer (need %d bytes)!", My_Connections[Idx].rdatalen ); + return FALSE; } + memcpy( My_Connections[Idx].zip.rbuf, My_Connections[Idx].rbuf, My_Connections[Idx].rdatalen ); + My_Connections[Idx].zip.rdatalen = My_Connections[Idx].rdatalen; + My_Connections[Idx].rdatalen = 0; +#ifdef DEBUG + Log( LOG_DEBUG, "Moved already received data (%d bytes) to uncompression buffer.", My_Connections[Idx].zip.rdatalen ); +#endif /* DEBUG */ } -#endif +#endif /* ZLIB */ } - + if( action ) result = TRUE; } while( action ); - + return result; } /* Handle_Buffer */ @@ -1251,14 +1315,18 @@ Check_Connections( VOID ) if( My_Connections[i].lastping < time( NULL ) - Conf_PongTimeout ) { /* Timeout */ +#ifdef DEBUG Log( LOG_DEBUG, "Connection %d: Ping timeout: %d seconds.", i, Conf_PongTimeout ); +#endif Conn_Close( i, NULL, "Ping timeout", TRUE ); } } else if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout ) { /* es muss ein PING gesendet werden */ +#ifdef DEBUG Log( LOG_DEBUG, "Connection %d: sending PING ...", i ); +#endif My_Connections[i].lastping = time( NULL ); Conn_WriteStr( i, "PING :%s", Client_ID( Client_ThisServer( ))); } @@ -1269,7 +1337,9 @@ Check_Connections( VOID ) if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout ) { /* Timeout */ +#ifdef DEBUG Log( LOG_DEBUG, "Connection %d timed out ...", i ); +#endif Conn_Close( i, NULL, "Timeout", FALSE ); } } @@ -1325,7 +1395,9 @@ Check_Servers( VOID ) 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 ); @@ -1348,7 +1420,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; @@ -1358,11 +1430,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; } @@ -1377,8 +1450,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; } @@ -1391,7 +1465,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; } @@ -1401,9 +1477,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; } @@ -1411,25 +1489,29 @@ 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; - + +#ifdef DEBUG Log( LOG_DEBUG, "Registered new connection %d on socket %d.", Idx, My_Connections[Idx].sock ); +#endif } /* New_Server */ @@ -1457,7 +1539,7 @@ Init_Conn_Struct( CONN_ID Idx ) My_Connections[Idx].flag = 0; My_Connections[Idx].options = 0; -#ifdef USE_ZLIB +#ifdef ZLIB My_Connections[Idx].zip.rbuf[0] = '\0'; My_Connections[Idx].zip.rdatalen = 0; My_Connections[Idx].zip.wbuf[0] = '\0'; @@ -1471,24 +1553,40 @@ Init_Conn_Struct( CONN_ID Idx ) LOCAL BOOLEAN Init_Socket( INT Sock ) { - /* Socket-Optionen setzen */ + /* Initialize socket (set options) */ - INT on = 1; + INT value; -#ifdef O_NONBLOCK /* A/UX kennt das nicht? */ +#ifdef O_NONBLOCK /* unknown on A/UX */ if( fcntl( Sock, F_SETFL, O_NONBLOCK ) != 0 ) { - Log( LOG_CRIT, "Can't enable non-blocking mode: %s!", strerror( errno )); + Log( LOG_CRIT, "Can't enable non-blocking mode for socket: %s!", strerror( errno )); close( Sock ); return FALSE; } #endif - if( setsockopt( Sock, SOL_SOCKET, SO_REUSEADDR, &on, (socklen_t)sizeof( on )) != 0) + + /* Don't block this port after socket shutdown */ + value = 1; + if( setsockopt( Sock, SOL_SOCKET, SO_REUSEADDR, &value, (socklen_t)sizeof( value )) != 0 ) { - Log( LOG_ERR, "Can't set socket options: %s!", strerror( errno )); - /* dieser Fehler kann ignoriert werden. */ + Log( LOG_ERR, "Can't set socket option SO_REUSEADDR: %s!", strerror( errno )); + /* ignore this error */ } + /* Set type of service (TOS) */ +#if defined(IP_TOS) && defined(IPTOS_LOWDELAY) + value = IPTOS_LOWDELAY; +#ifdef DEBUG + Log( LOG_DEBUG, "Setting option IP_TOS on socket %d to IPTOS_LOWDELAY (%d).", Sock, value ); +#endif + if( setsockopt( Sock, SOL_IP, IP_TOS, &value, (socklen_t)sizeof( value )) != 0 ) + { + Log( LOG_ERR, "Can't set socket option IP_TOS: %s!", strerror( errno )); + /* ignore this error */ + } +#endif + return TRUE; } /* Init_Socket */ @@ -1496,65 +1594,132 @@ Init_Socket( INT Sock ) LOCAL VOID Read_Resolver_Result( INT r_fd ) { - /* Ergebnis von Resolver Sub-Prozess aus Pipe lesen - * und entsprechende Connection aktualisieren */ + /* Read result of resolver sub-process from pipe and update the + * apropriate connection/client structure(s): hostname and/or + * IDENT user name.*/ - CHAR result[HOST_LEN]; CLIENT *c; INT len, i, n; + RES_STAT *s; + CHAR *ptr; - FD_CLR( r_fd, &Resolver_FDs ); - - /* Anfrage vom Parent lesen */ - len = read( r_fd, result, HOST_LEN - 1 ); - if( len < 0 ) - { - /* Fehler beim Lesen aus der Pipe */ - close( r_fd ); - Log( LOG_CRIT, "Resolver: Can't read result: %s!", strerror( errno )); - return; - } - result[len] = '\0'; - - /* zugehoerige Connection suchen */ + /* Search associated connection ... */ for( i = 0; i < Pool_Size; i++ ) { - if(( My_Connections[i].sock != NONE ) && ( My_Connections[i].res_stat ) && ( My_Connections[i].res_stat->pipe[0] == r_fd )) break; + if(( My_Connections[i].sock != NONE ) + && ( My_Connections[i].res_stat != NULL ) + && ( My_Connections[i].res_stat->pipe[0] == r_fd )) + break; } if( i >= Pool_Size ) { - /* Opsa! Keine passende Connection gefunden!? Vermutlich - * wurde sie schon wieder geschlossen. */ + /* Ops, none found? Probably the connection has already + * been closed!? We'll ignore that ... */ + FD_CLR( r_fd, &Resolver_FDs ); close( r_fd ); +#ifdef DEBUG Log( LOG_DEBUG, "Resolver: Got result for unknown connection!?" ); +#endif return; } - 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] ); - free( My_Connections[i].res_stat ); - My_Connections[i].res_stat = NULL; + /* 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! */ + close( r_fd ); + Log( LOG_CRIT, "Resolver: Can't read result: %s!", strerror( errno )); + return; + } + s->bufpos += len; + s->buffer[s->bufpos] = '\0'; + + /* If the result string is incomplete, return to main loop and + * wait until we can read in more bytes. */ +#ifdef IDENTAUTH +try_resolve: +#endif + ptr = strchr( s->buffer, '\n' ); + if( ! ptr ) return; + *ptr = '\0'; +#ifdef DEBUG + Log( LOG_DEBUG, "Got result from resolver: \"%s\" (%d bytes), stage %d.", s->buffer, len, s->stage ); +#endif + + /* 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 + * incoming conneciions.*/ if( My_Connections[i].sock > NONE ) { - /* Eingehende Verbindung: Hostnamen setzen */ + /* Incoming connection */ + + /* Search client ... */ c = Client_GetFromConn( i ); assert( c != NULL ); - strlcpy( My_Connections[i].host, result, sizeof( My_Connections[i].host )); - Client_SetHostname( c, result ); + + /* Only update client information of unregistered clients */ + if( Client_Type( c ) == CLIENT_UNKNOWN ) + { + if( s->stage == 0 ) + { + /* host name */ + strlcpy( My_Connections[i].host, s->buffer, sizeof( My_Connections[i].host )); + Client_SetHostname( c, s->buffer ); + +#ifdef IDENTAUTH + /* clean up buffer for IDENT result */ + len = strlen( s->buffer ) + 1; + memmove( s->buffer, s->buffer + len, sizeof( s->buffer ) - len ); + s->bufpos -= len; + + /* Don't close pipe and clean up, but + * instead wait for IDENT result */ + s->stage = 1; + goto try_resolve; + } + else if( s->stage == 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 + } + else Log( LOG_ERR, "Resolver: got result for unknown stage %d!?", s->stage ); + } +#ifdef DEBUG + else Log( LOG_DEBUG, "Resolver: discarding result for already registered connection %d.", i ); +#endif } else { - /* Ausgehende Verbindung (=Server): IP setzen */ + /* 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 ); - 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!?" ); + assert( n > NONE ); + + strlcpy( Conf_Server[n].ip, s->buffer, sizeof( Conf_Server[n].ip )); } - /* Penalty-Zeit zurueck setzen */ + /* Clean up ... */ + FD_CLR( r_fd, &Resolver_FDs ); + close( My_Connections[i].res_stat->pipe[0] ); + close( My_Connections[i].res_stat->pipe[1] ); + free( My_Connections[i].res_stat ); + My_Connections[i].res_stat = NULL; + + /* Reset penalty time */ Conn_ResetPenalty( i ); } /* Read_Resolver_Result */ @@ -1574,4 +1739,18 @@ Simple_Message( INT Sock, CHAR *Msg ) } /* Simple_Error */ +LOCAL INT +Count_Connections( struct sockaddr_in addr_in ) +{ + INT i, cnt; + + cnt = 0; + for( i = 0; i < Pool_Size; i++ ) + { + if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].addr.sin_addr.s_addr == addr_in.sin_addr.s_addr )) cnt++; + } + return cnt; +} /* Count_Connections */ + + /* -eof- */