X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconn.c;h=e5e59de7e9a6c8ebe275bdbae52feedb1b24eb3a;hp=48c1f46841f9d364199eaffaf947b330ff33e209;hb=a49a580a778d3ac194439c8fa14e7dc915b7b2b0;hpb=c40592d2cef21dd255af978644eb96c330913be7 diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 48c1f468..e5e59de7 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,7 +16,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: conn.c,v 1.128 2003/12/26 15:55:07 alex Exp $"; +static char UNUSED id[] = "$Id: conn.c,v 1.137 2004/05/30 16:25:51 alex Exp $"; #include "imp.h" #include @@ -33,18 +33,22 @@ static char UNUSED id[] = "$Id: conn.c,v 1.128 2003/12/26 15:55:07 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 TCPWRAP -#include /* for TCP Wrappers */ +# include /* for TCP Wrappers */ #endif #include "defines.h" @@ -64,7 +68,7 @@ static char UNUSED id[] = "$Id: conn.c,v 1.128 2003/12/26 15:55:07 alex Exp $"; #include "tool.h" #ifdef RENDEZVOUS -#include "rendezvous.h" +# include "rendezvous.h" #endif #include "exp.h" @@ -113,7 +117,7 @@ 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! */ @@ -610,6 +614,7 @@ 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 ZLIB DOUBLE in_z_k, out_z_k; @@ -617,7 +622,6 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient ) #endif assert( Idx > NONE ); - assert( My_Connections[Idx].sock > NONE ); /* Is this link already shutting down? */ if( My_Connections[Idx].options & CONN_ISCLOSING ) @@ -627,8 +631,16 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient ) 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 ); @@ -647,7 +659,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 */ @@ -868,11 +879,9 @@ Handle_Write( CONN_ID Idx ) return FALSE; } -#ifdef DEBUG - 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 ); -#endif + 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 ); } @@ -937,6 +946,7 @@ New_Connection( INT Sock ) #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! */ @@ -994,11 +1004,11 @@ New_Connection( INT Sock ) /* 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 ); + ptr = (POINTER *)malloc( sizeof( CONNECTION ) * new_size ); if( ! ptr ) { /* Offenbar steht kein weiterer Sepeicher zur Verfuegung :-( */ @@ -1020,7 +1030,7 @@ New_Connection( INT Sock ) #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 ); @@ -1054,7 +1064,11 @@ 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 */ @@ -1545,24 +1559,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 */ @@ -1570,35 +1600,28 @@ 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!?" ); @@ -1606,33 +1629,103 @@ Read_Resolver_Result( INT r_fd ) return; } -#ifdef DEBUG - Log( LOG_DEBUG, "Resolver: %s is \"%s\".", My_Connections[i].host, result ); + /* 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'; - /* 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; +#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 */