X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconn.c;h=137d4c70e5152c0e4382aa0f7682affbe43a6023;hp=d19e0030fb7eaba342a7f12ec2c8e6e87b0a5928;hb=8adff5922376676c2eeb49de1cbab86cc345b887;hpb=d67d94ea04990be49b3d56b1540746c0785faf1b diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index d19e0030..137d4c70 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1,190 +1,30 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2004 Alexander Barton * - * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen - * der GNU General Public License (GPL), wie von der Free Software Foundation - * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 - * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. - * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste - * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * Please read the file COPYING, README and AUTHORS for more information. * - * $Id: conn.c,v 1.48 2002/03/10 17:50:48 alex Exp $ - * - * connect.h: Verwaltung aller Netz-Verbindungen ("connections") - * - * $Log: conn.c,v $ - * Revision 1.48 2002/03/10 17:50:48 alex - * - Handling von "--version" und "--help" nochmal geaendert ... - * - * Revision 1.47 2002/03/04 23:16:23 alex - * - Logging geaendert: detaillierter im Syslog, "allgemeiner" fuer Clients. - * - * Revision 1.46 2002/03/02 03:32:08 alex - * - Aenderung des Idle-Verhalten revidiert: das war ein Schnellschuss :-/ - * - * Revision 1.45 2002/03/02 02:44:01 alex - * - Timeouts ausgehender Verbindungen werden besser erkannt (z.B. unter Cygwin). - * - Idle-Time der Hauptschleife [Conn_Handle()] erhoeht: weniger Last. - * - * Revision 1.44 2002/03/02 00:43:31 alex - * - bei abgebrochene ausgehende Server-Verbindungen wird der naechste Ver- - * bindungsversuch in RECONNECT_DELAY Sekunden (3) unternommen und nicht - * mehr "ConnectRetry" Sekunden gewartet. - * - * Revision 1.43 2002/03/02 00:29:11 alex - * - der Wert der Konfigurations-Variable "ConnectRetry" wird besser beachtet. - * - * Revision 1.42 2002/03/02 00:23:32 alex - * - ausgehende Verbindungen werden nun asyncron connectiert und blockieren - * nicht mehr den Server. Dadurch waren einige Aenderungen noetig. - * - diverse Log-Meldungen ueberarbeitet. - * - * Revision 1.41 2002/02/27 14:47:04 alex - * - Logging bei Timeout von Verbindungen geaendert. - * - * Revision 1.40 2002/02/27 02:26:23 alex - * - an Conn_Close() werden zwei weitere Fehlermeldungen zum Forwarden uebergeben. - * - * Revision 1.39 2002/02/23 00:03:54 alex - * - Ergebnistyp von Conn_GetIdle() und Conn_LastPing() auf "time_t" geaendert. - * - * Revision 1.38 2002/02/19 20:34:31 alex - * - Bei ausgehenden Verbindungen wird der Ziel-Port ins Log geschrieben. - * - * Revision 1.37 2002/02/19 20:05:37 alex - * - "Passive-Mode" implementiert: kein Auto-Conect zu anderen Servern. - * - * Revision 1.36 2002/02/11 01:00:50 alex - * - neue Funktion Conn_LastPing(). - * - * Revision 1.35 2002/01/18 11:12:11 alex - * - der Sniffer wird nun nur noch aktiviert, wenn auf Kommandozeile angegeben. - * - * Revision 1.34 2002/01/07 15:29:52 alex - * - PASSSERVERADD definiert, wird beim PASS-Befehl an Server verwendet. - * - * Revision 1.33 2002/01/06 15:18:14 alex - * - Loglevel und Meldungen nochmals geaendert. Level passen nun besser. - * - * Revision 1.32 2002/01/05 23:25:25 alex - * - Vorbereitungen fuer Ident-Abfragen bei neuen Client-Strukturen. - * - * Revision 1.31 2002/01/05 19:15:03 alex - * - Fehlerpruefung bei select() in der "Hauptschleife" korrigiert. - * - * Revision 1.30 2002/01/05 15:56:23 alex - * - "arpa/inet.h" wird nur noch includiert, wenn vorhanden. - * - Ein Fehler bei select() fuerht nun zum Abbruch von ngIRCd. - * - NO_ADDRESS durch NO_DATA ersetzt: ist wohl portabler. - * - * Revision 1.29 2002/01/04 01:36:40 alex - * - Loglevel ein wenig angepasst. - * - * Revision 1.28 2002/01/04 01:20:23 alex - * - Client-Strukruren werden nur noch ueber Funktionen angesprochen. - * - * Revision 1.27 2002/01/03 02:25:36 alex - * - diverse Aenderungen und Umsetellungen fuer Server-Links. - * - * Revision 1.26 2002/01/02 02:50:47 alex - * - Asyncroner Resolver Hostname->IP. - * - Server-Links begonnen zu implementieren. Die Verbindung wird aufgebaut, - * jedoch noch keine SERVER-Befehle verschickt. - * - Diverse Bug-Fixes und kleinere Erweiterungen. - * - * Revision 1.24 2002/01/01 18:25:44 alex - * - #include's fuer stdlib.h ergaenzt. - * - * Revision 1.23 2001/12/31 02:18:51 alex - * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART), - * - neuen Header "defines.h" mit (fast) allen Konstanten. - * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes. - * - * Revision 1.22 2001/12/30 19:26:11 alex - * - Unterstuetzung fuer die Konfigurationsdatei eingebaut. - * - * Revision 1.21 2001/12/29 22:33:36 alex - * - bessere Dokumentation des Modules bzw. der Funktionen. - * - * Revision 1.20 2001/12/29 22:09:43 alex - * - kleinere Aenderungen ("clean-ups") bei Logging (Resolver). - * - * Revision 1.19 2001/12/29 21:53:57 alex - * - Da hatte ich mich wohl ein wenig verrannt; jetzt sollte der Resolver - * aber tatsaechlich funktionieren. - * - * Revision 1.18 2001/12/29 20:17:25 alex - * - asyncronen Resolver (IP->Name) implementiert, dadurch div. Aenderungen. - * - * Revision 1.17 2001/12/29 03:06:16 alex - * - Loglevel (nochmal) angepasst. - * - * Revision 1.16 2001/12/27 19:32:44 alex - * - bei "Null-Requests" wird nichts mehr geloggt. Uberfluessig, da normal. - * - * Revision 1.15 2001/12/27 16:35:04 alex - * - vergessene Variable bei Ping-Timeout-Logmeldung ergaenzt. Opsa. - * - * Revision 1.14 2001/12/26 14:45:37 alex - * - "Code Cleanups". - * - * Revision 1.13 2001/12/26 03:36:57 alex - * - Verbindungen mit Lesefehlern werden nun korrekt terminiert. - * - * Revision 1.12 2001/12/26 03:20:53 alex - * - PING/PONG-Timeout implementiert. - * - * Revision 1.11 2001/12/25 23:15:16 alex - * - buffer werden nun periodisch geprueft, keine haengenden Clients mehr. - * - * Revision 1.10 2001/12/25 22:03:47 alex - * - Conn_Close() eingefuehrt: war die lokale Funktion Close_Connection(). - * - * Revision 1.9 2001/12/24 01:32:33 alex - * - in Conn_WriteStr() wurde das CR+LF nicht angehaengt! - * - Fehler-Ausgaben vereinheitlicht. - * - * Revision 1.8 2001/12/23 22:02:54 alex - * - Conn_WriteStr() nimmt nun variable Parameter, - * - diverse kleinere Aenderungen. - * - * Revision 1.7 2001/12/21 22:24:25 alex - * - kleinere Aenderungen an den Log-Meldungen, - * - Parse_Request() wird aufgerufen. - * - * Revision 1.6 2001/12/15 00:11:55 alex - * - Lese- und Schreib-Puffer implementiert. - * - einige neue (Unter-)Funktionen eingefuehrt. - * - diverse weitere kleinere Aenderungen. - * - * Revision 1.5 2001/12/14 08:16:47 alex - * - Begonnen, Client-spezifische Lesepuffer zu implementieren. - * - Umstellung auf Datentyp "CONN_ID". - * - * Revision 1.4 2001/12/13 02:04:16 alex - * - boesen "Speicherschiesser" in Log() gefixt. - * - * Revision 1.3 2001/12/13 01:33:09 alex - * - Conn_Handler() unterstuetzt nun einen Timeout. - * - fuer Verbindungen werden keine FILE-Handles mehr benutzt. - * - kleinere "Code Cleanups" ;-) - * - * Revision 1.2 2001/12/12 23:32:02 alex - * - diverse Erweiterungen und Verbesserungen (u.a. sind nun mehrere - * Verbindungen und Listen-Sockets moeglich). - * - * Revision 1.1 2001/12/12 17:18:38 alex - * - Modul zur Verwaltung aller Netzwerk-Verbindungen begonnen. + * Connection management */ -#include -#include "global.h" +#define CONN_MODULE + +#include "portab.h" + +static char UNUSED id[] = "$Id: conn.c,v 1.144 2005/03/19 18:43:48 fw Exp $"; -#include +#include "imp.h" #include -#include +#ifdef PROTOTYPES +# include +#else +# include +#endif #include #include #include @@ -196,128 +36,163 @@ #include #include #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 /* u.a. fuer Mac OS X */ +# include /* e.g. for Mac OS X */ #endif +#ifdef TCPWRAP +# include /* 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 "conf.h" +#include "conn-zip.h" +#include "conn-func.h" #include "log.h" #include "parse.h" #include "tool.h" -#include -#include "conn.h" +#ifdef RENDEZVOUS +# include "rendezvous.h" +#endif +#include "exp.h" -#define SERVER_WAIT NONE - 1 +#define SERVER_WAIT (NONE - 1) -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 lastdata; /* Letzte Aktivitaet */ - time_t lastping; /* Letzter PING */ - time_t lastprivmsg; /* Letzte PRIVMSG */ -} CONNECTION; - - -LOCAL VOID Handle_Read( INT sock ); -LOCAL BOOLEAN Handle_Write( CONN_ID Idx ); -LOCAL VOID New_Connection( INT Sock ); -LOCAL CONN_ID Socket2Index( INT Sock ); -LOCAL VOID Read_Request( CONN_ID Idx ); -LOCAL BOOLEAN Try_Write( CONN_ID Idx ); -LOCAL VOID Handle_Buffer( CONN_ID Idx ); -LOCAL VOID Check_Connections( VOID ); -LOCAL VOID Check_Servers( VOID ); -LOCAL VOID Init_Conn_Struct( INT Idx ); -LOCAL BOOLEAN Init_Socket( INT Sock ); -LOCAL VOID New_Server( INT Server, CONN_ID Idx ); - -LOCAL RES_STAT *ResolveAddr( struct sockaddr_in *Addr ); -LOCAL RES_STAT *ResolveName( CHAR *Host ); -LOCAL VOID Do_ResolveAddr( struct sockaddr_in *Addr, INT w_fd ); -LOCAL VOID Do_ResolveName( CHAR *Host, INT w_fd ); -LOCAL VOID Read_Resolver_Result( INT r_fd ); -LOCAL CHAR *Resolv_Error( INT H_Error ); +LOCAL void Handle_Read PARAMS(( int sock )); +LOCAL bool Handle_Write PARAMS(( CONN_ID Idx )); +LOCAL void New_Connection PARAMS(( int Sock )); +LOCAL CONN_ID Socket2Index PARAMS(( int Sock )); +LOCAL void Read_Request PARAMS(( CONN_ID Idx )); +LOCAL bool Try_Write PARAMS(( CONN_ID Idx )); +LOCAL bool Handle_Buffer PARAMS(( CONN_ID Idx )); +LOCAL void Check_Connections PARAMS(( void )); +LOCAL void Check_Servers PARAMS(( void )); +LOCAL void Init_Conn_Struct PARAMS(( CONN_ID Idx )); +LOCAL bool 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_Resolvers; LOCAL fd_set My_Connects; -LOCAL INT My_Max_Fd; - -LOCAL CONNECTION My_Connections[MAX_CONNECTIONS]; +#ifdef TCPWRAP +int allow_severity = LOG_INFO; +int deny_severity = LOG_ERR; +#endif -GLOBAL VOID Conn_Init( VOID ) +GLOBAL void +Conn_Init( void ) { /* Modul initialisieren: statische Strukturen "ausnullen". */ CONN_ID i; + /* Speicher fuer Verbindungs-Pool anfordern */ + Pool_Size = CONNECTION_POOL; + if( Conf_MaxConnections > 0 ) + { + /* konfiguriertes Limit beachten */ + if( Pool_Size > Conf_MaxConnections ) Pool_Size = Conf_MaxConnections; + } + 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 ); + } +#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 ); FD_ZERO( &My_Sockets ); - FD_ZERO( &My_Resolvers ); FD_ZERO( &My_Connects ); - My_Max_Fd = 0; + /* Groesster File-Descriptor fuer select() */ + Conn_MaxFD = 0; /* Connection-Struktur initialisieren */ - for( i = 0; i < MAX_CONNECTIONS; i++ ) Init_Conn_Struct( i ); + for( i = 0; i < Pool_Size; i++ ) Init_Conn_Struct( i ); + + /* Global write counter */ + WCounter = 0; } /* Conn_Init */ -GLOBAL VOID Conn_Exit( VOID ) +GLOBAL void +Conn_Exit( void ) { /* Modul abmelden: alle noch offenen Connections * schliessen und freigeben. */ CONN_ID idx; - INT i; + int i; - /* Sockets schliessen */ +#ifdef DEBUG Log( LOG_DEBUG, "Shutting down all connections ..." ); - for( i = 0; i < My_Max_Fd + 1; i++ ) +#endif + +#ifdef RENDEZVOUS + Rendezvous_UnregisterListeners( ); +#endif + + /* Sockets schliessen */ + for( i = 0; i < Conn_MaxFD + 1; i++ ) { if( FD_ISSET( i, &My_Sockets )) { - for( idx = 0; idx < MAX_CONNECTIONS; idx++ ) + for( idx = 0; idx < Pool_Size; idx++ ) { if( My_Connections[idx].sock == i ) break; } 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 ) + { + if( NGIRCd_SignalRestart ) Conn_Close( idx, NULL, "Server going down (restarting)", true ); + else Conn_Close( idx, NULL, "Server going down", true ); } - else if( idx < MAX_CONNECTIONS ) Conn_Close( idx, NULL, "Server going down", TRUE ); else { Log( LOG_WARNING, "Closing unknown connection %d ...", i ); @@ -325,40 +200,104 @@ GLOBAL VOID Conn_Exit( VOID ) } } } + + free( My_Connections ); + My_Connections = NULL; + Pool_Size = 0; } /* Conn_Exit */ -GLOBAL BOOLEAN Conn_NewListener( CONST INT Port ) +GLOBAL int +Conn_InitListeners( void ) +{ + /* Initialize ports on which the server should accept connections */ + + int created, i; + + created = 0; + for( i = 0; i < Conf_ListenPorts_Count; i++ ) + { + if( Conn_NewListener( Conf_ListenPorts[i] )) created++; + else Log( LOG_ERR, "Can't listen on port %u!", Conf_ListenPorts[i] ); + } + return created; +} /* Conn_InitListeners */ + + +GLOBAL void +Conn_ExitListeners( void ) +{ + /* 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++ ) + { + 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 */ + + +GLOBAL bool +Conn_NewListener( const UINT16 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; + 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); if( sock < 0 ) { Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno )); - return FALSE; + return false; } - if( ! Init_Socket( sock )) return FALSE; + if( ! Init_Socket( sock )) return false; /* an Port binden */ if( bind( sock, (struct sockaddr *)&addr, (socklen_t)sizeof( addr )) != 0 ) { Log( LOG_CRIT, "Can't bind socket: %s!", strerror( errno )); close( sock ); - return FALSE; + return false; } /* in "listen mode" gehen :-) */ @@ -366,26 +305,57 @@ GLOBAL BOOLEAN Conn_NewListener( CONST INT Port ) { Log( LOG_CRIT, "Can't listen on soecket: %s!", strerror( errno )); close( sock ); - return FALSE; + return false; } /* Neuen Listener in Strukturen einfuegen */ FD_SET( sock, &My_Listeners ); FD_SET( sock, &My_Sockets ); - if( sock > My_Max_Fd ) My_Max_Fd = sock; + 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 ); - return TRUE; +#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 */ -GLOBAL VOID Conn_Handler( INT Timeout ) +GLOBAL void +Conn_Handler( void ) { - /* Aktive Verbindungen ueberwachen. Mindestens alle "Timeout" - * Sekunden wird die Funktion verlassen. Folgende Aktionen - * werden durchgefuehrt: + /* "Hauptschleife": Aktive Verbindungen ueberwachen. Folgende Aktionen + * werden dabei durchgefuehrt, bis der Server terminieren oder neu + * starten soll: + * * - neue Verbindungen annehmen, * - Server-Verbindungen aufbauen, * - geschlossene Verbindungen loeschen, @@ -396,49 +366,63 @@ GLOBAL VOID Conn_Handler( INT Timeout ) fd_set read_sockets, write_sockets; struct timeval tv; - time_t start; - INT i; + time_t start, t; + CONN_ID i, idx; + bool timeout; start = time( NULL ); - while(( time( NULL ) - start < Timeout ) && ( ! NGIRCd_Quit )) + while(( ! NGIRCd_SignalQuit ) && ( ! NGIRCd_SignalRestart )) { - Check_Servers( ); + timeout = true; + +#ifdef RENDEZVOUS + Rendezvous_Handler( ); +#endif + + /* Should the configuration be reloaded? */ + if( NGIRCd_SignalRehash ) NGIRCd_Rehash( ); + /* Check configured servers and established links */ + Check_Servers( ); Check_Connections( ); - /* Timeout initialisieren */ - tv.tv_sec = 0; - tv.tv_usec = 50000; + t = time( NULL ); /* noch volle Lese-Buffer suchen */ - for( i = 0; i < MAX_CONNECTIONS; i++ ) + 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? */ - Handle_Buffer( i ); + if( Handle_Buffer( i )) timeout = false; } } - + /* noch volle Schreib-Puffer suchen */ FD_ZERO( &write_sockets ); - for( i = 0; i < MAX_CONNECTIONS; i++ ) + for( i = 0; i < Pool_Size; i++ ) { +#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 )) +#endif { /* Socket der Verbindung in Set aufnehmen */ FD_SET( My_Connections[i].sock, &write_sockets ); } } + /* Sockets mit im Aufbau befindlichen ausgehenden Verbindungen suchen */ - for( i = 0; i < MAX_CONNECTIONS; i++ ) + for( i = 0; i < Pool_Size; i++ ) { if(( My_Connections[i].sock > NONE ) && ( FD_ISSET( My_Connections[i].sock, &My_Connects ))) FD_SET( My_Connections[i].sock, &write_sockets ); } /* von welchen Sockets koennte gelesen werden? */ read_sockets = My_Sockets; - for( i = 0; i < MAX_CONNECTIONS; i++ ) + for( i = 0; i < Pool_Size; i++ ) { if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].host[0] == '\0' )) { @@ -450,219 +434,385 @@ GLOBAL VOID Conn_Handler( INT Timeout ) /* Hier laeuft noch ein asyncrones connect() */ FD_CLR( My_Connections[i].sock, &read_sockets ); } + if( My_Connections[i].delaytime > t ) + { + /* Fuer die Verbindung ist eine "Penalty-Zeit" gesetzt */ + FD_CLR( My_Connections[i].sock, &read_sockets ); + } } - for( i = 0; i < My_Max_Fd + 1; i++ ) + for( i = 0; i < Conn_MaxFD + 1; i++ ) { /* Pipes von Resolver Sub-Prozessen aufnehmen */ - if( FD_ISSET( i, &My_Resolvers )) + if( FD_ISSET( i, &Resolver_FDs )) { FD_SET( i, &read_sockets ); } } + /* Timeout initialisieren */ + tv.tv_usec = 0; + if( timeout ) tv.tv_sec = 1; + else tv.tv_sec = 0; + /* Auf Aktivitaet warten */ - if( select( My_Max_Fd + 1, &read_sockets, &write_sockets, NULL, &tv ) == -1 ) + i = select( Conn_MaxFD + 1, &read_sockets, &write_sockets, NULL, &tv ); + if( i == 0 ) { + /* keine Veraenderung an den Sockets */ + continue; + } + if( i == -1 ) + { + /* Fehler (z.B. Interrupt) */ if( errno != EINTR ) { - Log( LOG_EMERG, "select(): %s!", strerror( errno )); - Log( LOG_ALERT, PACKAGE" exiting due to fatal errors!" ); + Log( LOG_EMERG, "Conn_Handler(): select(): %s!", strerror( errno )); + Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME ); exit( 1 ); } continue; } /* Koennen Daten geschrieben werden? */ - for( i = 0; i < My_Max_Fd + 1; i++ ) + for( i = 0; i < Conn_MaxFD + 1; i++ ) { - if( FD_ISSET( i, &write_sockets )) Handle_Write( Socket2Index( i )); + if( ! FD_ISSET( i, &write_sockets )) continue; + + /* Es kann geschrieben werden ... */ + idx = Socket2Index( i ); + if( idx == NONE ) continue; + + if( ! Handle_Write( idx )) + { + /* Fehler beim Schreiben! Diesen Socket nun + * auch aus dem Read-Set entfernen: */ + FD_CLR( i, &read_sockets ); + } } /* Daten zum Lesen vorhanden? */ - for( i = 0; i < My_Max_Fd + 1; i++ ) + for( i = 0; i < Conn_MaxFD + 1; i++ ) { if( FD_ISSET( i, &read_sockets )) Handle_Read( i ); } } + + if( NGIRCd_SignalQuit ) Log( LOG_NOTICE|LOG_snotice, "Server going down NOW!" ); + else if( NGIRCd_SignalRestart ) Log( LOG_NOTICE|LOG_snotice, "Server restarting NOW!" ); } /* Conn_Handler */ -GLOBAL BOOLEAN Conn_WriteStr( CONN_ID Idx, CHAR *Format, ... ) +#ifdef PROTOTYPES +GLOBAL bool +Conn_WriteStr( CONN_ID Idx, char *Format, ... ) +#else +GLOBAL bool +Conn_WriteStr( Idx, Format, va_alist ) +CONN_ID Idx; +char *Format; +va_dcl +#endif { /* String in Socket schreiben. CR+LF wird von dieser Funktion * automatisch angehaengt. Im Fehlerfall wird dir Verbindung - * getrennt und FALSE geliefert. */ + * getrennt und false geliefert. */ - CHAR buffer[COMMAND_LEN]; - BOOLEAN ok; + char buffer[COMMAND_LEN]; + bool ok; va_list ap; + assert( Idx > NONE ); + assert( Format != NULL ); + +#ifdef PROTOTYPES va_start( ap, Format ); - if( vsnprintf( buffer, COMMAND_LEN - 2, Format, ap ) == COMMAND_LEN - 2 ) +#else + va_start( ap ); +#endif + 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 ); - return FALSE; + Conn_Close( Idx, "Text too long to send!", NULL, false ); + return false; } #ifdef SNIFFER if( NGIRCd_Sniffer ) Log( LOG_DEBUG, " -> connection %d: '%s'.", Idx, buffer ); #endif - strcat( buffer, "\r\n" ); + strlcat( buffer, "\r\n", sizeof( buffer )); ok = Conn_Write( Idx, buffer, strlen( buffer )); + My_Connections[Idx].msg_out++; va_end( ap ); return ok; } /* Conn_WriteStr */ -GLOBAL BOOLEAN Conn_Write( CONN_ID Idx, CHAR *Data, INT Len ) +GLOBAL bool +Conn_Write( CONN_ID Idx, char *Data, int Len ) { /* Daten in Socket schreiben. Bei "fatalen" Fehlern wird - * der Client disconnectiert und FALSE geliefert. */ + * der Client disconnectiert und false geliefert. */ - assert( Idx >= 0 ); - assert( My_Connections[Idx].sock > NONE ); + assert( Idx > NONE ); assert( Data != NULL ); assert( Len > 0 ); - /* pruefen, ob Daten im Schreibpuffer sind. Wenn ja, zunaechst - * pruefen, ob diese gesendet werden koennen */ - if( My_Connections[Idx].wdatalen > 0 ) + /* Ist der entsprechende Socket ueberhaupt noch offen? In einem + * "Handler-Durchlauf" kann es passieren, dass dem nicht mehr so + * ist, wenn einer von mehreren Conn_Write()'s fehlgeschlagen ist. + * In diesem Fall wird hier einfach ein Fehler geliefert. */ + if( My_Connections[Idx].sock <= NONE ) { - if( ! Try_Write( Idx )) return FALSE; +#ifdef DEBUG + Log( LOG_DEBUG, "Skipped write on closed socket (connection %d).", Idx ); +#endif + return false; } - /* pruefen, ob im Schreibpuffer genuegend Platz ist */ + /* Pruefen, ob im Schreibpuffer genuegend Platz ist. Ziel ist es, + * moeglichts viel im Puffer zu haben und _nicht_ gleich alles auf den + * Socket zu schreiben (u.a. wg. Komprimierung). */ if( WRITEBUFFER_LEN - My_Connections[Idx].wdatalen - Len <= 0 ) { - /* der Puffer ist dummerweise voll ... */ - Log( LOG_NOTICE, "Write buffer overflow (connection %d)!", Idx ); - Conn_Close( Idx, "Write buffer overflow!", NULL, FALSE ); - return FALSE; - } + /* Der Puffer ist dummerweise voll. Jetzt versuchen, den Puffer + * zu schreiben, wenn das nicht klappt, haben wir ein Problem ... */ + if( ! Try_Write( Idx )) return false; - /* Daten in Puffer kopieren */ - memcpy( My_Connections[Idx].wbuf + My_Connections[Idx].wdatalen, Data, Len ); - My_Connections[Idx].wdatalen += Len; + /* nun neu pruefen: */ + if( WRITEBUFFER_LEN - My_Connections[Idx].wdatalen - Len <= 0 ) + { + Log( LOG_NOTICE, "Write buffer overflow (connection %d)!", Idx ); + Conn_Close( Idx, "Write buffer overflow!", NULL, false ); + return false; + } + } - /* pruefen, on Daten vorhanden sind und geschrieben werden koennen */ - if( My_Connections[Idx].wdatalen > 0 ) +#ifdef ZLIB + if( My_Connections[Idx].options & CONN_ZIP ) { - if( ! Try_Write( Idx )) return FALSE; + /* Daten komprimieren und in Puffer kopieren */ + if( ! Zip_Buffer( Idx, Data, Len )) return false; + } + else +#endif + { + /* Daten in Puffer kopieren */ + memcpy( My_Connections[Idx].wbuf + My_Connections[Idx].wdatalen, Data, Len ); + My_Connections[Idx].wdatalen += Len; + My_Connections[Idx].bytes_out += Len; } - return TRUE; + /* Adjust global write counter */ + WCounter += Len; + + return true; } /* Conn_Write */ -GLOBAL VOID Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient ) +GLOBAL void +Conn_Close( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool 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; - - assert( Idx >= 0 ); + char *txt; + double in_k, out_k; +#ifdef ZLIB + double in_z_k, out_z_k; + int in_p, out_p; +#endif + + assert( Idx > 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 ); + + /* Should the client be informed? */ if( InformClient ) { +#ifndef STRICT_RFC + /* 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 + + /* 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 */ + (void)Try_Write( Idx ); + + /* Shut down socket */ if( close( My_Connections[Idx].sock ) != 0 ) { - Log( LOG_ERR, "Error closing connection %d with %s:%d - %s!", Idx, inet_ntoa( My_Connections[Idx].addr.sin_addr ), ntohs( My_Connections[Idx].addr.sin_port), strerror( errno )); + /* 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 ); + } + + /* 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 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.", Idx, inet_ntoa( My_Connections[Idx].addr.sin_addr ), ntohs( My_Connections[Idx].addr.sin_port )); + 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 ); } - c = Client_GetFromConn( Idx ); - if( c ) Client_Destroy( c, LogMsg, FwdMsg ); - + /* Is there a resolver sub-process running? */ if( My_Connections[Idx].res_stat ) { - /* Resolver-Strukturen freigeben, wenn noch nicht geschehen */ - FD_CLR( My_Connections[Idx].res_stat->pipe[0], &My_Resolvers ); + /* 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 ); } - /* Bei Server-Verbindungen lasttry-Zeitpunkt so setzen, dass - * der naechste Verbindungsversuch in RECONNECT_DELAY Sekunden - * gestartet wird */ - if( My_Connections[Idx].our_server >= 0 ) Conf_Server[My_Connections[Idx].our_server].lasttry = time( NULL ) - Conf_ConnectRetry + RECONNECT_DELAY; - - FD_CLR( My_Connections[Idx].sock, &My_Sockets ); - FD_CLR( My_Connections[Idx].sock, &My_Connects ); - My_Connections[Idx].sock = NONE; -} /* Conn_Close */ + /* Servers: Modify time of next connect attempt? */ + Conf_UnsetServer( Idx ); +#ifdef ZLIB + /* Clean up zlib, if link was compressed */ + if( Conn_Options( Idx ) & CONN_ZIP ) + { + inflateEnd( &My_Connections[Idx].zip.in ); + deflateEnd( &My_Connections[Idx].zip.out ); + } +#endif -GLOBAL VOID Conn_UpdateIdle( CONN_ID Idx ) -{ - /* Idle-Timer zuruecksetzen */ + /* Clean up connection structure (=free it) */ + Init_Conn_Struct( Idx ); - assert( Idx >= 0 ); - My_Connections[Idx].lastprivmsg = time( NULL ); -} +#ifdef DEBUG + Log( LOG_DEBUG, "Shutdown of connection %d completed.", Idx ); +#endif +} /* Conn_Close */ -GLOBAL time_t Conn_GetIdle( CONN_ID Idx ) +GLOBAL void +Conn_SyncServerStruct( void ) { - /* Idle-Time einer Verbindung liefern (in Sekunden) */ + /* Synchronize server structures (connection IDs): + * connections <-> configuration */ + + CLIENT *client; + CONN_ID i; + int c; - assert( Idx >= 0 ); - return time( NULL ) - My_Connections[Idx].lastprivmsg; -} /* Conn_GetIdle */ + 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; -GLOBAL time_t Conn_LastPing( CONN_ID Idx ) -{ - /* Zeitpunkt des letzten PING liefern */ + for( c = 0; c < MAX_SERVERS; c++ ) + { + /* Configured server? */ + if( ! Conf_Server[c].host[0] ) continue; - assert( Idx >= 0 ); - return My_Connections[Idx].lastping; -} /* Conn_LastPing */ + /* 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 ) +LOCAL bool +Try_Write( CONN_ID Idx ) { - /* Versuchen, Daten aus dem Schreib-Puffer in den - * Socket zu schreiben. */ + /* Versuchen, Daten aus dem Schreib-Puffer in den Socket zu + * schreiben. true wird geliefert, wenn entweder keine Daten + * zum Versenden vorhanden sind oder erfolgreich bearbeitet + * werden konnten. Im Fehlerfall wird false geliefert und + * die Verbindung geschlossen. */ fd_set write_socket; + struct timeval tv; - assert( Idx >= 0 ); + assert( Idx > NONE ); assert( My_Connections[Idx].sock > NONE ); - assert( My_Connections[Idx].wdatalen > 0 ); + + /* sind ueberhaupt Daten vorhanden? */ +#ifdef ZLIB + if(( ! My_Connections[Idx].wdatalen > 0 ) && ( ! My_Connections[Idx].zip.wdatalen )) return true; +#else + if( ! My_Connections[Idx].wdatalen > 0 ) return true; +#endif + + /* Timeout initialisieren: 0 Sekunden, also nicht blockieren */ + tv.tv_sec = 0; tv.tv_usec = 0; FD_ZERO( &write_socket ); FD_SET( My_Connections[Idx].sock, &write_socket ); - if( select( My_Connections[Idx].sock + 1, NULL, &write_socket, NULL, 0 ) == -1 ) + if( select( My_Connections[Idx].sock + 1, NULL, &write_socket, NULL, &tv ) == -1 ) { /* Fehler! */ if( errno != EINTR ) { - Log( LOG_ALERT, "select() failed: %s!", strerror( errno )); - Conn_Close( Idx, "Server error!", NULL, FALSE ); - return FALSE; + Log( LOG_ALERT, "Try_Write(): select() failed: %s (con=%d, sock=%d)!", strerror( errno ), Idx, My_Connections[Idx].sock ); + Conn_Close( Idx, "Server error!", NULL, false ); + return false; } } if( FD_ISSET( My_Connections[Idx].sock, &write_socket )) return Handle_Write( Idx ); - else return TRUE; + else return true; } /* Try_Write */ -LOCAL VOID Handle_Read( INT Sock ) +LOCAL void +Handle_Read( int Sock ) { /* Aktivitaet auf einem Socket verarbeiten: * - neue Clients annehmen, @@ -671,8 +821,8 @@ LOCAL VOID Handle_Read( INT Sock ) CONN_ID idx; - assert( Sock >= 0 ); - + assert( Sock > NONE ); + if( FD_ISSET( Sock, &My_Listeners )) { /* es ist einer unserer Listener-Sockets: es soll @@ -680,7 +830,7 @@ LOCAL VOID Handle_Read( INT Sock ) New_Connection( Sock ); } - else if( FD_ISSET( Sock, &My_Resolvers )) + else if( FD_ISSET( Sock, &Resolver_FDs )) { /* Rueckmeldung von einem Resolver Sub-Prozess */ @@ -691,18 +841,21 @@ LOCAL VOID Handle_Read( INT Sock ) /* Ein Client Socket: entweder ein User oder Server */ idx = Socket2Index( Sock ); - Read_Request( idx ); + if( idx > NONE ) Read_Request( idx ); } } /* Handle_Read */ -LOCAL BOOLEAN Handle_Write( CONN_ID Idx ) +LOCAL bool +Handle_Write( CONN_ID Idx ) { /* Daten aus Schreibpuffer versenden bzw. Connection aufbauen */ - INT len, res, err; + int len, res, err; + socklen_t sock_len; + CLIENT *c; - assert( Idx >= 0 ); + assert( Idx > NONE ); assert( My_Connections[Idx].sock > NONE ); if( FD_ISSET( My_Connections[Idx].sock, &My_Connects )) @@ -713,68 +866,86 @@ LOCAL BOOLEAN 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; + 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 ); - - /* PASS und SERVER verschicken */ - Conn_WriteStr( Idx, "PASS %s "PASSSERVERADD, Conf_Server[My_Connections[Idx].our_server].pwd ); - Conn_WriteStr( Idx, "SERVER %s :%s", Conf_ServerName, Conf_ServerInfo ); + Log( LOG_INFO, "Connection %d with \"%s:%d\" established. Now logging in ...", Idx, My_Connections[Idx].host, Conf_Server[Conf_GetServer( Idx )].port ); - return TRUE; + /* 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 ZLIB + /* Schreibpuffer leer, aber noch Daten im Kompressionsbuffer? + * Dann muss dieser nun geflushed werden! */ + if( My_Connections[Idx].wdatalen == 0 ) Zip_Flush( Idx ); +#endif + assert( My_Connections[Idx].wdatalen > 0 ); /* Daten schreiben */ len = send( My_Connections[Idx].sock, My_Connections[Idx].wbuf, My_Connections[Idx].wdatalen, 0 ); if( len < 0 ) { + /* Operation haette Socket "nur" blockiert ... */ + if( errno == EAGAIN ) return true; + /* Oops, ein Fehler! */ - Log( LOG_ERR, "Write error (buffer) on connection %d: %s!", Idx, strerror( errno )); - Conn_Close( Idx, "Write error (buffer)!", NULL, FALSE ); - return FALSE; + Log( LOG_ERR, "Write error on connection %d (socket %d): %s!", Idx, My_Connections[Idx].sock, strerror( errno )); + Conn_Close( Idx, "Write error!", NULL, false ); + return false; } /* Puffer anpassen */ My_Connections[Idx].wdatalen -= len; memmove( My_Connections[Idx].wbuf, My_Connections[Idx].wbuf + len, My_Connections[Idx].wdatalen ); - return TRUE; + return true; } /* Handle_Write */ -LOCAL VOID New_Connection( INT Sock ) +LOCAL void +New_Connection( int Sock ) { /* Neue Client-Verbindung von Listen-Socket annehmen und * CLIENT-Struktur anlegen. */ +#ifdef TCPWRAP + struct request_info req; +#endif struct sockaddr_in new_addr; - INT new_sock, new_sock_len; + int new_sock, new_sock_len; RES_STAT *s; CONN_ID idx; - - assert( Sock >= 0 ); + CLIENT *c; + POINTER *ptr; + long new_size, cnt; + + assert( Sock > NONE ); + /* Connection auf Listen-Socket annehmen */ new_sock_len = sizeof( new_addr ); new_sock = accept( Sock, (struct sockaddr *)&new_addr, (socklen_t *)&new_sock_len ); if( new_sock < 0 ) @@ -783,19 +954,94 @@ LOCAL VOID New_Connection( INT Sock ) return; } - /* Freie Connection-Struktur suschen */ - for( idx = 0; idx < MAX_CONNECTIONS; idx++ ) if( My_Connections[idx].sock == NONE ) break; - if( idx >= MAX_CONNECTIONS ) +#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 )) { - Log( LOG_ALERT, "Can't accept connection: limit reached (%d)!", MAX_CONNECTIONS ); + /* 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 ); + + /* 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 */ + if( Pool_Size >= Conf_MaxConnections ) + { + /* 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; + } + + ptr = (POINTER *)realloc( My_Connections, sizeof( CONNECTION ) * new_size ); + if( ! ptr ) + { + Log( LOG_EMERG, "Can't allocate memory! [New_Connection]" ); + Simple_Message( new_sock, "ERROR: Internal error" ); + close( new_sock ); + return; + } + +#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 = (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; + } /* Client-Struktur initialisieren */ - if( ! Client_NewLocal( idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWN, FALSE )) + c = Client_NewLocal( idx, 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" ); close( new_sock ); return; } @@ -807,80 +1053,121 @@ LOCAL VOID New_Connection( INT Sock ) /* Neuen Socket registrieren */ FD_SET( new_sock, &My_Sockets ); - if( new_sock > My_Max_Fd ) My_Max_Fd = new_sock; + if( new_sock > Conn_MaxFD ) Conn_MaxFD = new_sock; 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 ); /* Hostnamen ermitteln */ - s = ResolveAddr( &new_addr ); + 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; } - else - { - /* kann Namen nicht aufloesen */ - strcpy( My_Connections[idx].host, inet_ntoa( new_addr.sin_addr )); - } + + /* Penalty-Zeit setzen */ + Conn_SetPenalty( idx, 4 ); } /* New_Connection */ -LOCAL CONN_ID Socket2Index( INT Sock ) +LOCAL CONN_ID +Socket2Index( int Sock ) { /* zum Socket passende Connection suchen */ CONN_ID idx; - assert( Sock >= 0 ); + assert( Sock > NONE ); - for( idx = 0; idx < MAX_CONNECTIONS; idx++ ) if( My_Connections[idx].sock == Sock ) break; + for( idx = 0; idx < Pool_Size; idx++ ) if( My_Connections[idx].sock == Sock ) break; - assert( idx < MAX_CONNECTIONS ); - return idx; + if( idx >= Pool_Size ) + { + /* 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; } /* Socket2Index */ -LOCAL VOID Read_Request( CONN_ID Idx ) +LOCAL void +Read_Request( CONN_ID Idx ) { /* Daten von Socket einlesen und entsprechend behandeln. * Tritt ein Fehler auf, so wird der Socket geschlossen. */ - INT len; + int len, bsize; +#ifdef ZLIB + CLIENT *c; +#endif - assert( Idx >= 0 ); + assert( Idx > NONE ); assert( My_Connections[Idx].sock > NONE ); - if( READBUFFER_LEN - My_Connections[Idx].rdatalen - 2 < 0 ) + /* wenn noch nicht registriert: maximal mit ZREADBUFFER_LEN arbeiten, + * ansonsten koennen Daten ggf. nicht umkopiert werden. */ + bsize = READBUFFER_LEN; +#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 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; } - len = recv( My_Connections[Idx].sock, My_Connections[Idx].rbuf + My_Connections[Idx].rdatalen, READBUFFER_LEN - My_Connections[Idx].rdatalen - 2, 0 ); +#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 ); + if( len > 0 ) My_Connections[Idx].zip.rdatalen += len; + } + else +#endif + { + len = recv( My_Connections[Idx].sock, My_Connections[Idx].rbuf + My_Connections[Idx].rdatalen, bsize - My_Connections[Idx].rdatalen - 1, 0 ); + if( len > 0 ) My_Connections[Idx].rdatalen += len; + } if( len == 0 ) { /* Socket wurde geschlossen */ - Log( LOG_INFO, "%s:%d is closing the connection ...", inet_ntoa( My_Connections[Idx].addr.sin_addr ), ntohs( My_Connections[Idx].addr.sin_port)); - Conn_Close( Idx, "Socket closed!", "Client closed connection", FALSE ); + Log( LOG_INFO, "%s:%d (%s) is closing the connection ...", My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port), inet_ntoa( My_Connections[Idx].addr.sin_addr )); + Conn_Close( Idx, "Socket closed!", "Client closed connection", false ); return; } if( len < 0 ) { + /* Operation haette Socket "nur" blockiert ... */ + if( errno == EAGAIN ) return; + /* Fehler beim Lesen */ - Log( LOG_ERR, "Read error on connection %d: %s!", Idx, strerror( errno )); - Conn_Close( Idx, "Read error!", "Client closed connection", FALSE ); + Log( LOG_ERR, "Read error on connection %d (socket %d): %s!", Idx, My_Connections[Idx].sock, strerror( errno )); + Conn_Close( Idx, "Read error!", "Client closed connection", false ); return; } - /* Lesebuffer updaten */ - My_Connections[Idx].rdatalen += len; - assert( My_Connections[Idx].rdatalen < READBUFFER_LEN ); - My_Connections[Idx].rbuf[My_Connections[Idx].rdatalen] = '\0'; + /* Connection-Statistik aktualisieren */ + My_Connections[Idx].bytes_in += len; /* Timestamp aktualisieren */ My_Connections[Idx].lastdata = time( NULL ); @@ -889,70 +1176,132 @@ LOCAL VOID Read_Request( CONN_ID Idx ) } /* Read_Request */ -LOCAL VOID Handle_Buffer( CONN_ID Idx ) +LOCAL bool +Handle_Buffer( CONN_ID Idx ) { - /* Daten im Lese-Puffer einer Verbindung verarbeiten. */ + /* Daten im Lese-Puffer einer Verbindung verarbeiten. + * Wurde ein Request verarbeitet, so wird true geliefert, + * ansonsten false (auch bei Fehlern). */ - CHAR *ptr, *ptr1, *ptr2; - INT len, delta; - - /* Eine komplette Anfrage muss mit CR+LF enden, vgl. - * RFC 2812. Haben wir eine? */ - ptr = strstr( My_Connections[Idx].rbuf, "\r\n" ); - - if( ptr ) delta = 2; #ifndef STRICT_RFC - else - { - /* Nicht RFC-konforme Anfrage mit nur CR oder LF? Leider - * machen soetwas viele Clients, u.a. "mIRC" :-( */ - ptr1 = strchr( My_Connections[Idx].rbuf, '\r' ); - ptr2 = strchr( My_Connections[Idx].rbuf, '\n' ); - delta = 1; - if( ptr1 && ptr2 ) ptr = ptr1 > ptr2 ? ptr2 : ptr1; - else if( ptr1 ) ptr = ptr1; - else if( ptr2 ) ptr = ptr2; - } + char *ptr1, *ptr2; #endif - - if( ptr ) + char *ptr; + int len, delta; + bool action, result; +#ifdef ZLIB + bool old_z; +#endif + + result = false; + do { - /* Ende der Anfrage wurde gefunden */ - *ptr = '\0'; - len = ( ptr - My_Connections[Idx].rbuf ) + delta; - if( len > COMMAND_LEN ) + /* 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 ) { - /* Eine Anfrage darf(!) nicht laenger als 512 Zeichen - * (incl. CR+LF!) werden; vgl. RFC 2812. Wenn soetwas - * empfangen wird, wird der Client disconnectiert. */ - Log( LOG_ERR, "Request too long (connection %d): %d bytes!", Idx, My_Connections[Idx].rdatalen ); - Conn_Close( Idx, NULL, "Request too long", TRUE ); - return; + if( ! Unzip_Buffer( Idx )) return false; } - - if( len > delta ) +#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 { - /* Es wurde ein Request gelesen */ - if( ! Parse_Request( Idx, My_Connections[Idx].rbuf )) return; + /* Nicht RFC-konforme Anfrage mit nur CR oder LF? Leider + * machen soetwas viele Clients, u.a. "mIRC" :-( */ + ptr1 = strchr( My_Connections[Idx].rbuf, '\r' ); + ptr2 = strchr( My_Connections[Idx].rbuf, '\n' ); + delta = 1; + if( ptr1 && ptr2 ) ptr = ptr1 > ptr2 ? ptr2 : ptr1; + else if( ptr1 ) ptr = ptr1; + else if( ptr2 ) ptr = ptr2; } +#endif - /* Puffer anpassen */ - My_Connections[Idx].rdatalen -= len; - memmove( My_Connections[Idx].rbuf, My_Connections[Idx].rbuf + len, My_Connections[Idx].rdatalen ); - } + action = false; + if( ptr ) + { + /* Ende der Anfrage wurde gefunden */ + *ptr = '\0'; + len = ( ptr - My_Connections[Idx].rbuf ) + delta; + if( len > ( COMMAND_LEN - 1 )) + { + /* Eine Anfrage darf(!) nicht laenger als 512 Zeichen + * (incl. CR+LF!) werden; vgl. RFC 2812. Wenn soetwas + * empfangen wird, wird der Client disconnectiert. */ + Log( LOG_ERR, "Request too long (connection %d): %d bytes (max. %d expected)!", Idx, My_Connections[Idx].rdatalen, COMMAND_LEN - 1 ); + Conn_Close( Idx, NULL, "Request too long", true ); + return false; + } + +#ifdef ZLIB + /* merken, ob Stream bereits komprimiert wird */ + old_z = My_Connections[Idx].options & CONN_ZIP; +#endif + + if( len > delta ) + { + /* Es wurde ein Request gelesen */ + My_Connections[Idx].msg_in++; + if( ! Parse_Request( Idx, My_Connections[Idx].rbuf )) return false; + else action = true; + } + + /* Puffer anpassen */ + My_Connections[Idx].rdatalen -= len; + memmove( My_Connections[Idx].rbuf, My_Connections[Idx].rbuf + len, My_Connections[Idx].rdatalen ); + +#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 ) + { + /* 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 /* ZLIB */ + } + + if( action ) result = true; + } while( action ); + + return result; } /* Handle_Buffer */ -LOCAL VOID Check_Connections( VOID ) +LOCAL void +Check_Connections( void ) { /* Pruefen, ob Verbindungen noch "alive" sind. Ist dies * nicht der Fall, zunaechst PING-PONG spielen und, wenn * auch das nicht "hilft", Client disconnectieren. */ CLIENT *c; - INT i; + CONN_ID i; - for( i = 0; i < MAX_CONNECTIONS; i++ ) + for( i = 0; i < Pool_Size; i++ ) { if( My_Connections[i].sock == NONE ) continue; @@ -966,14 +1315,18 @@ LOCAL VOID Check_Connections( VOID ) if( My_Connections[i].lastping < time( NULL ) - Conf_PongTimeout ) { /* Timeout */ - Log( LOG_DEBUG, "Connection %d: Ping timeout.", i ); - Conn_Close( i, NULL, "Ping timeout", TRUE ); +#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( ))); } @@ -984,114 +1337,122 @@ LOCAL VOID Check_Connections( VOID ) if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout ) { /* Timeout */ +#ifdef DEBUG Log( LOG_DEBUG, "Connection %d timed out ...", i ); - Conn_Close( i, NULL, "Timeout", FALSE ); +#endif + Conn_Close( i, NULL, "Timeout", false ); } } } } /* Check_Connections */ -LOCAL VOID Check_Servers( VOID ) +LOCAL void +Check_Servers( void ) { - /* Pruefen, ob Server-Verbindungen aufgebaut werden - * muessen bzw. koennen */ + /* Check if we can establish further server links */ - INT idx, i, n; RES_STAT *s; + CONN_ID idx; + int i, n; - /* Wenn "Passive-Mode" aktiv: nicht verbinden */ - if( NGIRCd_Passive ) return; - - 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; - - /* Haben wir schon eine Verbindung? */ - for( n = 0; n < MAX_CONNECTIONS; n++ ) - { - /* Verbindung zu diesem Server? */ - if(( My_Connections[n].sock != NONE ) && ( My_Connections[n].our_server == i )) - { - /* Komplett aufgebaute Verbindung? */ - if( My_Connections[n].sock > NONE ) break; + if( My_Connections[idx].sock != SERVER_WAIT ) continue; - /* IP schon aufgeloest? */ - if( My_Connections[n].res_stat == NULL ) New_Server( i, n ); - } + /* IP resolved? */ + if( My_Connections[idx].res_stat == NULL ) New_Server( Conf_GetServer( idx ), idx ); + } + + /* 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].sock != NONE ) && ( My_Connections[n].our_server != 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[n].group == Conf_Server[i].group != NONE ) 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 < MAX_CONNECTIONS ) 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 */ - for( idx = 0; idx < MAX_CONNECTIONS; idx++ ) if( My_Connections[idx].sock == NONE ) break; - if( idx >= MAX_CONNECTIONS ) + /* 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)!", MAX_CONNECTIONS ); + 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; - My_Connections[idx].our_server = i; - - /* Hostnamen in IP aufloesen */ - s = ResolveName( Conf_Server[i].host ); + 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 ); if( s ) { /* Sub-Prozess wurde asyncron gestartet */ My_Connections[idx].res_stat = s; } - else - { - /* kann Namen nicht aufloesen: Connection-Struktur freigeben */ - Init_Conn_Struct( idx ); - } } } /* Check_Servers */ -LOCAL VOID New_Server( INT Server, CONN_ID Idx ) +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; - INT new_sock; + int res, new_sock; CLIENT *c; - assert( Server >= 0 ); - assert( Idx >= 0 ); + 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; } - + Log( LOG_INFO, "Establishing connection to \"%s\", %s, port %d (connection %d) ... ", Conf_Server[Server].host, Conf_Server[Server].ip, Conf_Server[Server].port, Idx ); +#ifdef HAVE_INET_ATON if( inet_aton( Conf_Server[Server].ip, &inaddr ) == 0 ) +#else + memset( &inaddr, 0, sizeof( inaddr )); + inaddr.s_addr = inet_addr( Conf_Server[Server].ip ); + 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; } @@ -1104,47 +1465,58 @@ LOCAL VOID 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; } if( ! Init_Socket( new_sock )) return; - connect( new_sock, (struct sockaddr *)&new_addr, sizeof( new_addr )); - if( errno != EINPROGRESS ) + 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 ); - Log( LOG_CRIT, "Can't connect socket: %s!", strerror( errno )); + Conf_Server[Server].conn_id = NONE; return; } /* Client-Struktur initialisieren */ - c = Client_NewLocal( Idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWNSERVER, FALSE ); + 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; - strcpy( My_Connections[Idx].host, Conf_Server[Server].host ); + 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 > My_Max_Fd ) My_Max_Fd = new_sock; + 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 */ -LOCAL VOID Init_Conn_Struct( INT Idx ) +LOCAL void +Init_Conn_Struct( CONN_ID Idx ) { /* Connection-Struktur initialisieren */ @@ -1155,285 +1527,230 @@ LOCAL VOID Init_Conn_Struct( INT 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; My_Connections[Idx].lastprivmsg = time( NULL ); + My_Connections[Idx].delaytime = 0; + My_Connections[Idx].bytes_in = 0; + My_Connections[Idx].bytes_out = 0; + My_Connections[Idx].msg_in = 0; + My_Connections[Idx].msg_out = 0; + My_Connections[Idx].flag = 0; + My_Connections[Idx].options = 0; + +#ifdef ZLIB + My_Connections[Idx].zip.rbuf[0] = '\0'; + My_Connections[Idx].zip.rdatalen = 0; + My_Connections[Idx].zip.wbuf[0] = '\0'; + My_Connections[Idx].zip.wdatalen = 0; + My_Connections[Idx].zip.bytes_in = 0; + My_Connections[Idx].zip.bytes_out = 0; +#endif } /* Init_Conn_Struct */ -LOCAL BOOLEAN Init_Socket( INT Sock ) +LOCAL bool +Init_Socket( int Sock ) { - /* Socket-Optionen setzen */ + /* Initialize socket (set options) */ - INT on = 1; + int value; +#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; + return false; } - if( setsockopt( Sock, SOL_SOCKET, SO_REUSEADDR, &on, (socklen_t)sizeof( on )) != 0) - { - Log( LOG_ERR, "Can't set socket options: %s!", strerror( errno )); - /* dieser Fehler kann ignoriert werden. */ - } - - return TRUE; -} /* Init_Socket */ - - -LOCAL RES_STAT *ResolveAddr( struct sockaddr_in *Addr ) -{ - /* IP (asyncron!) aufloesen. Bei Fehler, z.B. wenn der - * Child-Prozess nicht erzeugt werden kann, wird NULL geliefert. - * Der Host kann dann nicht aufgeloest werden. */ - - RES_STAT *s; - INT pid; +#endif - /* Speicher anfordern */ - s = malloc( sizeof( RES_STAT )); - if( ! s ) + /* 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_EMERG, "Resolver: Can't allocate memory!" ); - return NULL; + Log( LOG_ERR, "Can't set socket option SO_REUSEADDR: %s!", strerror( errno )); + /* ignore this error */ } - /* Pipe fuer Antwort initialisieren */ - if( pipe( s->pipe ) != 0 ) + /* 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 ) { - free( s ); - Log( LOG_ALERT, "Resolver: Can't create output pipe: %s!", strerror( errno )); - return NULL; + Log( LOG_ERR, "Can't set socket option IP_TOS: %s!", strerror( errno )); + /* ignore this error */ } +#endif - /* Sub-Prozess erzeugen */ - pid = fork( ); - if( pid > 0 ) - { - /* Haupt-Prozess */ - Log( LOG_DEBUG, "Resolver for %s created (PID %d).", inet_ntoa( Addr->sin_addr ), pid ); - FD_SET( s->pipe[0], &My_Resolvers ); - if( s->pipe[0] > My_Max_Fd ) My_Max_Fd = s->pipe[0]; - s->pid = pid; - return s; - } - else if( pid == 0 ) - { - /* Sub-Prozess */ - Log_Init_Resolver( ); - Do_ResolveAddr( Addr, s->pipe[1] ); - Log_Exit_Resolver( ); - exit( 0 ); - } - else - { - /* Fehler */ - free( s ); - Log( LOG_CRIT, "Resolver: Can't fork: %s!", strerror( errno )); - return NULL; - } -} /* ResolveAddr */ + return true; +} /* Init_Socket */ -LOCAL RES_STAT *ResolveName( CHAR *Host ) +LOCAL void +Read_Resolver_Result( int r_fd ) { - /* Hostnamen (asyncron!) aufloesen. Bei Fehler, z.B. wenn der - * Child-Prozess nicht erzeugt werden kann, wird NULL geliefert. - * Der Host kann dann nicht aufgeloest werden. */ + /* 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 len, i, n; RES_STAT *s; - INT pid; - - /* Speicher anfordern */ - s = malloc( sizeof( RES_STAT )); - if( ! s ) - { - Log( LOG_EMERG, "Resolver: Can't allocate memory!" ); - return NULL; - } + char *ptr; - /* Pipe fuer Antwort initialisieren */ - if( pipe( s->pipe ) != 0 ) + /* Search associated connection ... */ + for( i = 0; i < Pool_Size; i++ ) { - free( s ); - Log( LOG_ALERT, "Resolver: Can't create output pipe: %s!", strerror( errno )); - return NULL; + if(( My_Connections[i].sock != NONE ) + && ( My_Connections[i].res_stat != NULL ) + && ( My_Connections[i].res_stat->pipe[0] == r_fd )) + break; } - - /* Sub-Prozess erzeugen */ - pid = fork( ); - if( pid > 0 ) - { - /* Haupt-Prozess */ - Log( LOG_DEBUG, "Resolver for \"%s\" created (PID %d).", Host, pid ); - FD_SET( s->pipe[0], &My_Resolvers ); - if( s->pipe[0] > My_Max_Fd ) My_Max_Fd = s->pipe[0]; - s->pid = pid; - return s; - } - else if( pid == 0 ) + if( i >= Pool_Size ) { - /* Sub-Prozess */ - Log_Init_Resolver( ); - Do_ResolveName( Host, s->pipe[1] ); - Log_Exit_Resolver( ); - exit( 0 ); - } - else - { - /* Fehler */ - free( s ); - Log( LOG_CRIT, "Resolver: Can't fork: %s!", strerror( errno )); - return NULL; + /* 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; } -} /* ResolveName */ - - -LOCAL VOID Do_ResolveAddr( struct sockaddr_in *Addr, INT w_fd ) -{ - /* Resolver Sub-Prozess: IP aufloesen und Ergebnis in Pipe schreiben. */ - - CHAR hostname[HOST_LEN]; - struct hostent *h; - Log_Resolver( LOG_DEBUG, "Now resolving %s ...", inet_ntoa( Addr->sin_addr )); + /* Get resolver structure */ + s = My_Connections[i].res_stat; + assert( s != NULL ); - /* Namen aufloesen */ - h = gethostbyaddr( (CHAR *)&Addr->sin_addr, sizeof( Addr->sin_addr ), AF_INET ); - if( h ) strcpy( hostname, h->h_name ); - else - { - Log_Resolver( LOG_WARNING, "Can't resolve address %s: code %s!", inet_ntoa( Addr->sin_addr ), Resolv_Error( h_errno )); - strcpy( hostname, inet_ntoa( Addr->sin_addr )); - } - - /* Antwort an Parent schreiben */ - if( write( w_fd, hostname, strlen( hostname ) + 1 ) != ( strlen( hostname ) + 1 )) + /* Read result from pipe */ + len = read( r_fd, s->buffer + s->bufpos, sizeof( s->buffer ) - s->bufpos - 1 ); + if( len < 0 ) { - Log_Resolver( LOG_CRIT, "Resolver: Can't write to parent: %s!", strerror( errno )); - close( w_fd ); + /* Error! */ + close( r_fd ); + Log( LOG_CRIT, "Resolver: Can't read result: %s!", strerror( errno )); return; } + s->bufpos += len; + s->buffer[s->bufpos] = '\0'; - Log_Resolver( LOG_DEBUG, "Ok, translated %s to \"%s\".", inet_ntoa( Addr->sin_addr ), hostname ); -} /* Do_ResolveAddr */ - + /* 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'; -LOCAL VOID Do_ResolveName( CHAR *Host, INT w_fd ) -{ - /* Resolver Sub-Prozess: Name aufloesen und Ergebnis in Pipe schreiben. */ +#ifdef DEBUG + Log( LOG_DEBUG, "Got result from resolver: \"%s\" (%d bytes), stage %d.", s->buffer, len, s->stage ); +#endif - CHAR ip[16]; - struct hostent *h; - struct in_addr *addr; + /* 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 ) + { + /* Incoming connection */ - Log_Resolver( LOG_DEBUG, "Now resolving \"%s\" ...", Host ); + /* Search client ... */ + c = Client_GetFromConn( i ); + assert( c != NULL ); - /* Namen aufloesen */ - h = gethostbyname( Host ); - if( h ) - { - addr = (struct in_addr *)h->h_addr; - strcpy( ip, inet_ntoa( *addr )); + /* 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 { - Log_Resolver( LOG_WARNING, "Can't resolve \"%s\": %s!", Host, Resolv_Error( h_errno )); - strcpy( ip, "" ); - } - - /* Antwort an Parent schreiben */ - if( write( w_fd, ip, strlen( ip ) + 1 ) != ( strlen( ip ) + 1 )) - { - Log_Resolver( LOG_CRIT, "Resolver: Can't write to parent: %s!", strerror( errno )); - close( w_fd ); - return; - } - - if( ip[0] ) Log_Resolver( LOG_DEBUG, "Ok, translated \"%s\" to %s.", Host, ip ); -} /* Do_ResolveName */ - - -LOCAL VOID Read_Resolver_Result( INT r_fd ) -{ - /* Ergebnis von Resolver Sub-Prozess aus Pipe lesen - * und entsprechende Connection aktualisieren */ + /* Outgoing connection (server link): set the IP address + * so that we can connect to it in the main loop. */ - CHAR result[HOST_LEN]; - CLIENT *c; - INT len, i; - - FD_CLR( r_fd, &My_Resolvers ); - - /* Anfrage vom Parent lesen */ - len = read( r_fd, result, HOST_LEN); - 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'; + /* Search server ... */ + n = Conf_GetServer( i ); + assert( n > NONE ); - /* zugehoerige Connection suchen */ - for( i = 0; i < MAX_CONNECTIONS; i++ ) - { - if(( My_Connections[i].sock != NONE ) && ( My_Connections[i].res_stat ) && ( My_Connections[i].res_stat->pipe[0] == r_fd )) break; - } - if( i >= MAX_CONNECTIONS ) - { - /* Opsa! Keine passende Connection gefunden!? Vermutlich - * wurde sie schon wieder geschlossen. */ - close( r_fd ); - Log( LOG_DEBUG, "Resolver: Got result for unknown connection!?" ); - return; + strlcpy( Conf_Server[n].ip, s->buffer, sizeof( Conf_Server[n].ip )); } - /* Aufraeumen */ + /* 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; - if( My_Connections[i].sock > NONE ) - { - /* Eingehende Verbindung: Hostnamen setzen */ - c = Client_GetFromConn( i ); - assert( c != NULL ); - strcpy( My_Connections[i].host, result ); - Client_SetHostname( c, result ); - } - else - { - /* Ausgehende Verbindung (=Server): IP setzen */ - assert( My_Connections[i].our_server >= 0 ); - strcpy( Conf_Server[My_Connections[i].our_server].ip, result ); - } + /* Reset penalty time */ + Conn_ResetPenalty( i ); } /* Read_Resolver_Result */ -LOCAL CHAR *Resolv_Error( INT H_Error ) +LOCAL void +Simple_Message( int Sock, char *Msg ) { - /* Fehlerbeschreibung fuer H_Error liefern */ + /* 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 */ - switch( H_Error ) + +LOCAL int +Count_Connections( struct sockaddr_in addr_in ) +{ + int i, cnt; + + cnt = 0; + for( i = 0; i < Pool_Size; i++ ) { - case HOST_NOT_FOUND: - return "host not found"; - case NO_DATA: - return "name valid but no IP address defined"; - case NO_RECOVERY: - return "name server error"; - case TRY_AGAIN: - return "name server temporary not available"; - default: - return "unknown error"; + if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].addr.sin_addr.s_addr == addr_in.sin_addr.s_addr )) cnt++; } -} /* Resolv_Error */ + return cnt; +} /* Count_Connections */ /* -eof- */