/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2005 Alexander Barton <alex@barton.de>
*
- * 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.97 2002/11/28 12:17:38 alex Exp $
- *
- * connect.h: Verwaltung aller Netz-Verbindungen ("connections")
+ * Connection management
*/
+#define CONN_MODULE
+
#include "portab.h"
+#include "io.h"
+
+static char UNUSED id[] = "$Id: conn.c,v 1.170 2005/08/15 23:02:40 alex Exp $";
#include "imp.h"
#include <assert.h>
-#include <stdarg.h>
+#ifdef PROTOTYPES
+# include <stdarg.h>
+#else
+# include <varargs.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
-#include <fcntl.h>
#include <string.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <time.h>
#include <netinet/in.h>
+#ifdef HAVE_NETINET_IP_H
+# include <netinet/ip.h>
+#endif
+
#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
#else
-#define PF_INET AF_INET
+# define PF_INET AF_INET
#endif
#ifdef HAVE_STDINT_H
-#include <stdint.h> /* u.a. fuer Mac OS X */
+# include <stdint.h> /* e.g. for Mac OS X */
#endif
-#ifdef USE_ZLIB
-#include <zlib.h>
+#ifdef TCPWRAP
+# include <tcpd.h> /* for TCP Wrappers */
#endif
+#include "array.h"
+#include "defines.h"
+#include "resolve.h"
+
#include "exp.h"
#include "conn.h"
#include "imp.h"
#include "ngircd.h"
#include "client.h"
-#include "resolve.h"
#include "conf.h"
+#include "conn-zip.h"
+#include "conn-func.h"
#include "log.h"
#include "parse.h"
#include "tool.h"
+#ifdef ZEROCONF
+# include "rendezvous.h"
+#endif
+
#include "exp.h"
#define SERVER_WAIT (NONE - 1)
-#ifdef USE_ZLIB
-typedef struct _ZipData
-{
- z_stream in; /* "Handle" fuer Input-Stream */
- z_stream out; /* "Handle" fuer Output-Stream */
- CHAR rbuf[READBUFFER_LEN]; /* Lesepuffer */
- INT rdatalen; /* Laenge der Daten im Lesepuffer (komprimiert) */
- CHAR wbuf[WRITEBUFFER_LEN]; /* Schreibpuffer */
- INT wdatalen; /* Laenge der Daten im Schreibpuffer (unkomprimiert) */
- LONG bytes_in, bytes_out; /* Counter fuer Statistik (unkomprimiert!) */
-} ZIPDATA;
+static bool Handle_Write PARAMS(( CONN_ID Idx ));
+static int New_Connection PARAMS(( int Sock ));
+static CONN_ID Socket2Index PARAMS(( int Sock ));
+static void Read_Request PARAMS(( CONN_ID Idx ));
+static bool Handle_Buffer PARAMS(( CONN_ID Idx ));
+static void Check_Connections PARAMS(( void ));
+static void Check_Servers PARAMS(( void ));
+static void Init_Conn_Struct PARAMS(( CONN_ID Idx ));
+static bool Init_Socket PARAMS(( int Sock ));
+static void New_Server PARAMS(( int Server, CONN_ID Idx ));
+static void Simple_Message PARAMS(( int Sock, char *Msg ));
+static int Count_Connections PARAMS(( struct sockaddr_in addr ));
+static int NewListener PARAMS(( const UINT16 Port ));
+
+static array My_Listeners;
+
+#ifdef TCPWRAP
+int allow_severity = LOG_INFO;
+int deny_severity = LOG_ERR;
#endif
+static void server_login PARAMS((CONN_ID idx));
+
+static void cb_clientserver PARAMS((int sock, short what));
+
+static void
+cb_listen(int sock, short irrelevant)
+{
+ (void) irrelevant;
+ New_Connection( sock );
+}
+
-typedef struct _Connection
+static void
+cb_connserver(int sock, UNUSED short what)
{
- 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 */
- time_t delaytime; /* Nicht beachten bis ("penalty") */
- LONG bytes_in, bytes_out; /* Counter fuer Statistik */
- INT flag; /* "Markierungs-Flag" (vgl. "irc-write"-Modul) */
- INT options; /* Link-Optionen */
-#ifdef USE_ZLIB
- ZIPDATA zip; /* Kompressionsinformationen */
+ int res, err;
+ socklen_t sock_len;
+ CLIENT *c;
+ CONN_ID idx = Socket2Index( sock );
+ if (idx <= NONE) {
+#ifdef DEBUG
+ Log(LOG_DEBUG, "cb_connserver wants to write on unknown socket?!");
#endif
-} CONNECTION;
-
-
-LOCAL VOID Handle_Read PARAMS(( INT sock ));
-LOCAL BOOLEAN 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 BOOLEAN Try_Write PARAMS(( CONN_ID Idx ));
-LOCAL BOOLEAN Handle_Buffer PARAMS(( CONN_ID Idx ));
-LOCAL VOID Check_Connections PARAMS(( VOID ));
-LOCAL VOID Check_Servers PARAMS(( VOID ));
-LOCAL VOID Init_Conn_Struct PARAMS(( LONG Idx ));
-LOCAL BOOLEAN Init_Socket PARAMS(( INT Sock ));
-LOCAL VOID New_Server PARAMS(( INT Server, CONN_ID Idx ));
-LOCAL VOID Read_Resolver_Result PARAMS(( INT r_fd ));
-
-#ifdef USE_ZLIB
-LOCAL BOOLEAN Zip_Buffer PARAMS(( CONN_ID Idx, CHAR *Data, INT Len ));
-LOCAL BOOLEAN Zip_Flush PARAMS(( CONN_ID Idx ));
-LOCAL BOOLEAN Unzip_Buffer PARAMS(( CONN_ID Idx ));
+ io_close(sock);
+ return;
+ }
+
+ assert( what & IO_WANTWRITE);
+
+ /* connect() finished, get result. */
+ 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 )) {
+ 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[Conf_GetServer( idx )].port,
+ idx, strerror( err ));
+
+ /* Clean up socket, connection and client structures */
+ c = Client_GetFromConn( idx );
+ if( c ) Client_DestroyNow( c );
+ io_close( My_Connections[idx].sock );
+ Init_Conn_Struct( idx );
+
+ /* Bei Server-Verbindungen lasttry-Zeitpunkt auf "jetzt" setzen */
+ Conf_Server[Conf_GetServer( idx )].lasttry = time( NULL );
+ Conf_UnsetServer( idx );
+ return;
+ }
+
+ Conn_OPTION_DEL( &My_Connections[idx], CONN_ISCONNECTING );
+ server_login(idx);
+}
+
+
+static void
+server_login(CONN_ID idx)
+{
+ Log( LOG_INFO, "Connection %d with \"%s:%d\" established. Now logging in ...", idx,
+ My_Connections[idx].host, Conf_Server[Conf_GetServer( idx )].port );
+
+ io_event_setcb( My_Connections[idx].sock, cb_clientserver);
+ io_event_add( My_Connections[idx].sock, IO_WANTREAD|IO_WANTWRITE);
+
+ /* Send PASS and SERVER command to peer */
+ Conn_WriteStr( idx, "PASS %s %s", Conf_Server[Conf_GetServer( idx )].pwd_out, NGIRCd_ProtoID );
+ Conn_WriteStr( idx, "SERVER %s :%s", Conf_ServerName, Conf_ServerInfo );
+}
+
+
+static void
+cb_clientserver(int sock, short what)
+{
+ CONN_ID idx = Socket2Index( sock );
+ if (idx <= NONE) {
+#ifdef DEBUG
+ Log(LOG_WARNING, "WTF: cb_clientserver wants to write on unknown socket?!");
#endif
+ io_close(sock);
+ return;
+ }
+
+ if (what & IO_WANTREAD)
+ Read_Request( idx );
+ if (what & IO_WANTWRITE)
+ Handle_Write( idx );
+}
-LOCAL fd_set My_Listeners;
-LOCAL fd_set My_Sockets;
-LOCAL fd_set My_Connects;
-LOCAL CONNECTION *My_Connections;
-LOCAL LONG Pool_Size;
+static void
+FreeRes_stat( CONNECTION *c )
+{
+ assert( c != NULL );
+ assert( c->res_stat != NULL );
+
+ if (!c->res_stat) return;
+ io_close( c->res_stat->pipe[0] );
-GLOBAL VOID
-Conn_Init( VOID )
+ array_free(&c->res_stat->buffer);
+ free( c->res_stat );
+ c->res_stat = NULL;
+}
+
+
+GLOBAL void
+Conn_Init( void )
{
/* Modul initialisieren: statische Strukturen "ausnullen". */
/* konfiguriertes Limit beachten */
if( Pool_Size > Conf_MaxConnections ) Pool_Size = Conf_MaxConnections;
}
- My_Connections = malloc( sizeof( CONNECTION ) * Pool_Size );
+ My_Connections = (CONNECTION *) calloc( Pool_Size, sizeof( CONNECTION ) );
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 %ld items.", 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 );
- FD_ZERO( &My_Sockets );
- FD_ZERO( &My_Connects );
+ array_free( &My_Listeners );
/* Groesster File-Descriptor fuer select() */
Conn_MaxFD = 0;
/* Connection-Struktur initialisieren */
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;
- /* Sockets schliessen */
+#ifdef DEBUG
Log( LOG_DEBUG, "Shutting down all connections ..." );
- for( i = 0; i < Conn_MaxFD + 1; i++ )
- {
- if( FD_ISSET( i, &My_Sockets ))
- {
- for( idx = 0; idx < Pool_Size; idx++ )
- {
- if( My_Connections[idx].sock == i ) break;
- }
- if( FD_ISSET( i, &My_Listeners ))
- {
- close( i );
- Log( LOG_DEBUG, "Listening socket %d closed.", i );
- }
- else if( FD_ISSET( i, &My_Connects ))
- {
- close( i );
- Log( LOG_DEBUG, "Connection %d closed during creation (socket %d).", idx, i );
- }
- else if( idx < Pool_Size )
- {
- if( NGIRCd_Restart ) Conn_Close( idx, NULL, "Server going down (restarting)", TRUE );
- else Conn_Close( idx, NULL, "Server going down", TRUE );
- }
- else
- {
- Log( LOG_WARNING, "Closing unknown connection %d ...", i );
- close( i );
- }
+#endif
+
+ Conn_ExitListeners();
+
+ /* Sockets schliessen */
+ for( idx = 0; idx < Pool_Size; idx++ ) {
+ if( My_Connections[idx].sock > NONE ) {
+ Conn_Close( idx, NULL, NGIRCd_SignalRestart ?
+ "Server going down (restarting)":"Server going down", true );
+ continue;
}
}
-
+
free( My_Connections );
My_Connections = NULL;
Pool_Size = 0;
+ io_library_shutdown();
} /* Conn_Exit */
-GLOBAL INT
-Conn_InitListeners( VOID )
+static unsigned int
+ports_initlisteners(array *a, void (*func)(int,short))
{
- /* Ports, auf denen der Server Verbindungen entgegennehmen
- * soll, initialisieren */
+ unsigned int created = 0, len;
+ int fd;
+ UINT16 *port;
+
+ len = array_length(a, sizeof (UINT16));
+ port = array_start(a);
+ while(len--) {
+ fd = NewListener( *port );
+ if (fd < 0) {
+ port++;
+ continue;
+ }
+ if (!io_event_create( fd, IO_WANTREAD, func )) {
+ Log( LOG_ERR, "io_event_create(): Could not add listening fd %d (port %u): %s!",
+ fd, (unsigned int) *port, strerror(errno));
+ close(fd);
+ port++;
+ continue;
+ }
+ created++;
+ port++;
+ }
+
+ return created;
+}
- 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] );
+GLOBAL int
+Conn_InitListeners( void )
+{
+ /* Initialize ports on which the server should accept connections */
+
+ unsigned int created;
+
+ if (!io_library_init(CONNECTION_POOL)) {
+ Log(LOG_EMERG, "Cannot initialize IO routines: %s", strerror(errno));
+ return -1;
}
+
+ created = ports_initlisteners(&Conf_ListenPorts, cb_listen);
+
return created;
} /* Conn_InitListeners */
-GLOBAL VOID
-Conn_ExitListeners( VOID )
+GLOBAL void
+Conn_ExitListeners( void )
{
- /* Alle "Listen-Sockets" schliessen */
-
- INT i;
+ /* Close down all listening sockets */
+ int *fd;
+ unsigned int arraylen;
+#ifdef ZEROCONF
+ 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 );
- Log( LOG_DEBUG, "Listening socket %d closed.", i );
+ arraylen = array_length(&My_Listeners, sizeof (int));
+ Log( LOG_INFO, "Shutting down all listening sockets (%d)...", arraylen );
+ while(arraylen--) {
+ fd = (int*) array_get(&My_Listeners, sizeof (int), arraylen);
+ if (fd) {
+ close(*fd);
+#ifdef DEBUG
+ Log( LOG_DEBUG, "Listening socket %d closed.", *fd );
+ } else {
+ Log( LOG_DEBUG, "array_get pos %d returned NULL", arraylen );
+#endif
}
}
+ array_free(&My_Listeners);
} /* Conn_ExitListeners */
-GLOBAL BOOLEAN
-Conn_NewListener( CONST UINT Port )
+/* return new listening port file descriptor or -1 on failure */
+static int
+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 ZEROCONF
+ 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 -1;
+ }
+ }
+ 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 -1;
}
- if( ! Init_Socket( sock )) return FALSE;
+ if( ! Init_Socket( sock )) return -1;
/* 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 -1;
}
/* in "listen mode" gehen :-) */
{
Log( LOG_CRIT, "Can't listen on soecket: %s!", strerror( errno ));
close( sock );
- return FALSE;
+ return -1;
}
/* Neuen Listener in Strukturen einfuegen */
- FD_SET( sock, &My_Listeners );
- FD_SET( sock, &My_Sockets );
+ if (!array_catb( &My_Listeners,(char*) &sock, sizeof(int) )) {
+ Log( LOG_CRIT, "Can't add socket to My_Listeners array: %s!", strerror( errno ));
+ close( sock );
+ return -1;
+ }
+
+ 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 );
- if( sock > Conn_MaxFD ) Conn_MaxFD = sock;
+#ifdef ZEROCONF
+ /* 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;
+ }
- Log( LOG_INFO, "Now listening on port %d (socket %d).", Port, sock );
+ /* 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 ));
- return TRUE;
-} /* Conn_NewListener */
+ /* Register service */
+ Rendezvous_Register( name, MDNS_TYPE, Port );
+#endif
+ return sock;
+} /* NewListener */
-GLOBAL VOID
-Conn_Handler( VOID )
+GLOBAL void
+Conn_Handler( void )
{
- /* "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,
- * - volle Schreibpuffer versuchen zu schreiben,
- * - volle Lesepuffer versuchen zu verarbeiten,
- * - Antworten von Resolver Sub-Prozessen annehmen.
+ /* "Main Loop.": Loop until a signal (for shutdown or restart) arrives.
+ * Call io_dispatch() to check for read/writeable sockets every second
+ * Wait for status change on pending connections (e.g: when the hostname has been resolved)
+ * check for penalty/timeouts
+ * handle input buffers
*/
-
- fd_set read_sockets, write_sockets;
+ int i;
+ unsigned int wdatalen;
struct timeval tv;
time_t start, t;
- LONG i, idx;
- BOOLEAN timeout;
+ bool timeout;
start = time( NULL );
- while(( ! NGIRCd_Quit ) && ( ! NGIRCd_Restart ))
+ while(( ! NGIRCd_SignalQuit ) && ( ! NGIRCd_SignalRestart ))
{
- timeout = TRUE;
-
- Check_Servers( );
+ timeout = true;
+
+#ifdef ZEROCONF
+ Rendezvous_Handler( );
+#endif
+
+ /* Should the configuration be reloaded? */
+ if( NGIRCd_SignalRehash ) NGIRCd_Rehash( );
+ /* Check configured servers and established links */
+ 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 ) && ( array_bytes(&My_Connections[i].rbuf) > 0 ) &&
+ ( My_Connections[i].delaytime < t ))
{
/* Kann aus dem Buffer noch ein Befehl extrahiert werden? */
- if( Handle_Buffer( i )) timeout = FALSE;
+ if (Handle_Buffer( i )) timeout = false;
}
}
/* noch volle Schreib-Puffer suchen */
- FD_ZERO( &write_sockets );
- for( i = 0; i < Pool_Size; i++ )
- {
-#ifdef USE_ZLIB
- if(( My_Connections[i].sock > NONE ) && (( My_Connections[i].wdatalen > 0 ) || ( My_Connections[i].zip.wdatalen > 0 )))
+ for( i = 0; i < Pool_Size; i++ ) {
+ if ( My_Connections[i].sock <= NONE )
+ continue;
+
+ wdatalen = array_bytes(&My_Connections[i].wbuf);
+
+#ifdef ZLIB
+ if (( wdatalen > 0 ) || ( array_bytes(&My_Connections[i].zip.wbuf)> 0 ))
#else
- if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].wdatalen > 0 ))
+ if ( wdatalen > 0 )
#endif
{
/* Socket der Verbindung in Set aufnehmen */
- FD_SET( My_Connections[i].sock, &write_sockets );
+ io_event_add( My_Connections[i].sock, IO_WANTWRITE );
}
}
- /* Sockets mit im Aufbau befindlichen ausgehenden Verbindungen suchen */
- 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? */
- t = time( NULL );
- read_sockets = My_Sockets;
- for( i = 0; i < Pool_Size; i++ )
- {
- if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].host[0] == '\0' ))
- {
- /* Hier muss noch auf den Resolver Sub-Prozess gewartet werden */
- FD_CLR( My_Connections[i].sock, &read_sockets );
+ for (i = 0; i < Pool_Size; i++ ) {
+ if ( My_Connections[i].sock <= NONE )
+ continue;
+
+ if ( My_Connections[i].res_stat ) {
+ /* wait for completion of Resolver Sub-Process */
+ io_event_del( My_Connections[i].sock, IO_WANTREAD );
+ continue;
}
- if(( My_Connections[i].sock > NONE ) && ( FD_ISSET( My_Connections[i].sock, &My_Connects )))
- {
- /* Hier laeuft noch ein asyncrones connect() */
- FD_CLR( My_Connections[i].sock, &read_sockets );
- }
- if( My_Connections[i].delaytime > t )
- {
+
+ if ( Conn_OPTION_ISSET( &My_Connections[i], CONN_ISCONNECTING ))
+ continue; /* wait for completion of connect() */
+
+ if( My_Connections[i].delaytime > t ) {
/* Fuer die Verbindung ist eine "Penalty-Zeit" gesetzt */
- FD_CLR( My_Connections[i].sock, &read_sockets );
- FD_CLR( My_Connections[i].sock, &write_sockets );
- }
- }
- for( i = 0; i < Conn_MaxFD + 1; i++ )
- {
- /* Pipes von Resolver Sub-Prozessen aufnehmen */
- if( FD_ISSET( i, &Resolver_FDs ))
- {
- FD_SET( i, &read_sockets );
+ io_event_del( My_Connections[i].sock, IO_WANTREAD );
+ continue;
}
+ io_event_add( My_Connections[i].sock, IO_WANTREAD );
}
/* 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 )
- {
- /* keine Veraenderung an den Sockets */
- continue;
- }
- if( i == -1 )
- {
- /* Fehler (z.B. Interrupt) */
- if( errno != EINTR )
- {
- Log( LOG_EMERG, "Conn_Handler(): select(): %s!", strerror( errno ));
- Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
- exit( 1 );
- }
- continue;
- }
-
- /* Koennen Daten geschrieben werden? */
- for( i = 0; i < Conn_MaxFD + 1; 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 < Conn_MaxFD + 1; i++ )
- {
- if( FD_ISSET( i, &read_sockets )) Handle_Read( i );
+ /* Auf Aktivitaet warten */
+ i = io_dispatch( &tv );
+ if (i == -1 && errno != EINTR ) {
+ Log(LOG_EMERG, "Conn_Handler(): io_dispatch(): %s!", strerror(errno));
+ Log(LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME);
+ exit( 1 );
}
}
+
+ 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 */
+/**
+ * Write a text string into the socket of a connection.
+ * This function automatically appends CR+LF to the string and validates that
+ * the result is a valid IRC message (oversized messages are shortened, for
+ * example). Then it calls the Conn_Write() function to do the actual sending.
+ * @param Idx Index fo the connection.
+ * @param Format Format string, see printf().
+ * @return true on success, false otherwise.
+ */
#ifdef PROTOTYPES
-GLOBAL BOOLEAN
-Conn_WriteStr( CONN_ID Idx, CHAR *Format, ... )
+GLOBAL bool
+Conn_WriteStr( CONN_ID Idx, char *Format, ... )
#else
-GLOBAL BOOLEAN
+GLOBAL bool
Conn_WriteStr( Idx, Format, va_alist )
CONN_ID Idx;
-CHAR *Format;
+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. */
-
- CHAR buffer[COMMAND_LEN];
- BOOLEAN ok;
+ char buffer[COMMAND_LEN];
+ bool ok;
va_list ap;
assert( Idx > NONE );
#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;
+ if (vsnprintf( buffer, COMMAND_LEN - 2, Format, ap ) >= COMMAND_LEN - 2 ) {
+ /*
+ * The string that should be written to the socket is longer
+ * than the allowed size of COMMAND_LEN bytes (including both
+ * the CR and LF characters). This can be caused by the
+ * IRC_WriteXXX() functions when the prefix of this server had
+ * to be added to an already "quite long" command line which
+ * has been received from a regular IRC client, for example.
+ *
+ * We are not allowed to send such "oversized" messages to
+ * other servers and clients, see RFC 2812 2.3 and 2813 3.3
+ * ("these messages SHALL NOT exceed 512 characters in length,
+ * counting all characters including the trailing CR-LF").
+ *
+ * So we have a big problem here: we should send more bytes
+ * to the network than we are allowed to and we don't know
+ * the originator (any more). The "old" behaviour of blaming
+ * the receiver ("next hop") is a bad idea (it could be just
+ * an other server only routing the message!), so the only
+ * option left is to shorten the string and to hope that the
+ * result is still somewhat useful ...
+ * -alex-
+ */
+
+ strcpy (buffer + sizeof(buffer) - strlen(CUT_TXTSUFFIX) - 2 - 1,
+ CUT_TXTSUFFIX);
}
#ifdef SNIFFER
- if( NGIRCd_Sniffer ) Log( LOG_DEBUG, " -> connection %d: '%s'.", Idx, buffer );
+ 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, unsigned int Len )
{
/* Daten in Socket schreiben. Bei "fatalen" Fehlern wird
- * der Client disconnectiert und FALSE geliefert. */
+ * der Client disconnectiert und false geliefert. */
assert( Idx > NONE );
assert( Data != NULL );
* 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 );
- return FALSE;
+#endif
+ return false;
}
/* 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 )
- {
+ if( array_bytes(&My_Connections[Idx].wbuf) >= WRITEBUFFER_LEN) {
/* 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;
+ if( ! Handle_Write( Idx )) return false;
- /* nun neu pruefen: */
- if( WRITEBUFFER_LEN - My_Connections[Idx].wdatalen - Len <= 0 )
- {
+ /* check again: if our writebuf is twice als large as the initial limit: Kill connection */
+ if( array_bytes(&My_Connections[Idx].wbuf) >= (WRITEBUFFER_LEN*2)) {
Log( LOG_NOTICE, "Write buffer overflow (connection %d)!", Idx );
- Conn_Close( Idx, "Write buffer overflow!", NULL, FALSE );
- return FALSE;
+ Conn_Close( Idx, "Write buffer overflow!", NULL, false );
+ return false;
}
}
-#ifdef USE_ZLIB
- if( My_Connections[Idx].options & CONN_ZIP )
- {
+#ifdef ZLIB
+ if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) {
/* Daten komprimieren und in Puffer kopieren */
- if( ! Zip_Buffer( Idx, Data, Len )) return FALSE;
+ 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;
+ if (!array_catb( &My_Connections[Idx].wbuf, Data, Len ))
+ return false;
+
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;
- DOUBLE in_k, out_k;
-#ifdef USE_ZLIB
- DOUBLE in_z_k, out_z_k;
- INT in_p, out_p;
+ 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 );
- assert( My_Connections[Idx].sock > NONE );
-
- c = Client_GetFromConn( Idx );
- if( InformClient )
- {
- /* Statistik an Client melden, wenn 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 );
- }
-
- /* ERROR an Client schicken (von RFC so vorgesehen!) */
- if( FwdMsg ) Conn_WriteStr( Idx, "ERROR :%s", FwdMsg );
- else Conn_WriteStr( Idx, "ERROR :Closing connection." );
- if( My_Connections[Idx].sock == NONE ) return;
- }
-
- if( close( My_Connections[Idx].sock ) != 0 )
- {
- Log( LOG_ERR, "Error closing connection %d (socket %d) with %s:%d - %s!", Idx, My_Connections[Idx].sock, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port), strerror( errno ));
- }
- else
- {
- in_k = (DOUBLE)My_Connections[Idx].bytes_in / 1024;
- out_k = (DOUBLE)My_Connections[Idx].bytes_out / 1024;
-#ifdef USE_ZLIB
- if( My_Connections[Idx].options & CONN_ZIP )
- {
- in_z_k = (DOUBLE)My_Connections[Idx].zip.bytes_in / 1024;
- out_z_k = (DOUBLE)My_Connections[Idx].zip.bytes_out / 1024;
- in_p = (INT)(( in_k * 100 ) / in_z_k );
- out_p = (INT)(( out_k * 100 ) / out_z_k );
- Log( LOG_INFO, "Connection %d (socket %d) with %s:%d closed (in: %.1fk/%.1fk/%d%%, out: %.1fk/%.1fk/%d%%).", Idx, My_Connections[Idx].sock, 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
+ /* Is this link already shutting down? */
+ if( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ISCLOSING )) {
+ /* Conn_Close() has been called recursively for this link;
+ * probabe reason: Handle_Write() failed -- see below. */
+#ifdef DEBUG
+ Log( LOG_DEBUG, "Recursive request to close connection: %d", Idx );
#endif
- {
- Log( LOG_INFO, "Connection %d (socket %d) with %s:%d closed (in: %.1fk, out: %.1fk).", Idx, My_Connections[Idx].sock, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port ), in_k, out_k );
- }
- }
-
- /* Socket als "ungueltig" markieren */
- FD_CLR( My_Connections[Idx].sock, &My_Sockets );
- FD_CLR( My_Connections[Idx].sock, &My_Connects );
- My_Connections[Idx].sock = NONE;
-
- if( c ) Client_Destroy( c, LogMsg, FwdMsg, TRUE );
-
- if( My_Connections[Idx].res_stat )
- {
- /* Resolver-Strukturen freigeben, wenn noch nicht geschehen */
- FD_CLR( My_Connections[Idx].res_stat->pipe[0], &Resolver_FDs );
- close( My_Connections[Idx].res_stat->pipe[0] );
- close( My_Connections[Idx].res_stat->pipe[1] );
- free( My_Connections[Idx].res_stat );
- }
-
- /* Startzeit des naechsten Connect-Versuchs modifizieren? */
- if(( My_Connections[Idx].our_server > NONE ) && ( Conf_Server[My_Connections[Idx].our_server].lasttry < time( NULL ) - Conf_ConnectRetry ))
- {
- /* Okay, die Verbindung stand schon "genuegend lange":
- * lasttry-Zeitpunkt so setzen, dass der naechste
- * Verbindungsversuch in RECONNECT_DELAY Sekunden
- * gestartet wird. */
- Conf_Server[My_Connections[Idx].our_server].lasttry = time( NULL ) - Conf_ConnectRetry + RECONNECT_DELAY;
- }
-
-#ifdef USE_ZLIB
- /* Ggf. zlib abmelden */
- if( Conn_Options( Idx ) & CONN_ZIP )
- {
- inflateEnd( &My_Connections[Idx].zip.in );
- deflateEnd( &My_Connections[Idx].zip.out );
+ return;
}
-#endif
-
- /* Connection-Struktur loeschen (=freigeben) */
- Init_Conn_Struct( Idx );
-} /* Conn_Close */
-
-
-GLOBAL VOID
-Conn_UpdateIdle( CONN_ID Idx )
-{
- /* Idle-Timer zuruecksetzen */
-
- assert( Idx > NONE );
- My_Connections[Idx].lastprivmsg = time( NULL );
-}
-
-
-GLOBAL time_t
-Conn_GetIdle( CONN_ID Idx )
-{
- /* Idle-Time einer Verbindung liefern (in Sekunden) */
-
- assert( Idx > NONE );
- return time( NULL ) - My_Connections[Idx].lastprivmsg;
-} /* Conn_GetIdle */
-
-
-GLOBAL time_t
-Conn_LastPing( CONN_ID Idx )
-{
- /* Zeitpunkt des letzten PING liefern */
-
- assert( Idx > NONE );
- return My_Connections[Idx].lastping;
-} /* Conn_LastPing */
+ assert( My_Connections[Idx].sock > NONE );
-GLOBAL VOID
-Conn_SetPenalty( CONN_ID Idx, time_t Seconds )
-{
- /* Penalty-Delay fuer eine Verbindung (in Sekunden) setzen;
- * waehrend dieser Zeit wird der entsprechende Socket vom Server
- * bei Lese-Operationen komplett ignoriert. Der Delay kann mit
- * dieser Funktion nur erhoeht, nicht aber verringert werden. */
-
- time_t t;
-
- assert( Idx > NONE );
- assert( Seconds >= 0 );
-
- t = time( NULL ) + Seconds;
- if( t > My_Connections[Idx].delaytime ) My_Connections[Idx].delaytime = t;
-} /* Conn_SetPenalty */
-
-
-GLOBAL VOID
-Conn_ResetPenalty( CONN_ID Idx )
-{
- assert( Idx > NONE );
- My_Connections[Idx].delaytime = 0;
-} /* Conn_ResetPenalty */
-
-
-GLOBAL VOID
-Conn_ClearFlags( VOID )
-{
- /* Alle Connection auf "nicht-markiert" setzen */
-
- LONG i;
-
- for( i = 0; i < Pool_Size; i++ ) My_Connections[i].flag = 0;
-} /* Conn_ClearFlags */
-
-
-GLOBAL INT
-Conn_Flag( CONN_ID Idx )
-{
- /* Ist eine Connection markiert (TRUE) oder nicht? */
-
- assert( Idx > NONE );
- return My_Connections[Idx].flag;
-} /* Conn_Flag */
-
+ /* Mark link as "closing" */
+ Conn_OPTION_ADD( &My_Connections[Idx], CONN_ISCLOSING );
+
+ if( LogMsg ) txt = LogMsg;
+ else txt = FwdMsg;
+ if( ! txt ) txt = "Reason unknown";
-GLOBAL VOID
-Conn_SetFlag( CONN_ID Idx, INT Flag )
-{
- /* Connection markieren */
-
- assert( Idx > NONE );
- My_Connections[Idx].flag = Flag;
-} /* Conn_SetFlag */
+ 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 );
-GLOBAL CONN_ID
-Conn_First( VOID )
-{
- /* Connection-Struktur der ersten Verbindung liefern;
- * Ist keine Verbindung vorhanden, wird NONE geliefert. */
+ /* 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_ID(Client_ThisServer()), NOTICE_TXTPREFIX,
+ (double)My_Connections[Idx].bytes_in / 1024,
+ (double)My_Connections[Idx].bytes_out / 1024);
+ }
+#endif
- LONG i;
-
- for( i = 0; i < Pool_Size; i++ )
- {
- if( My_Connections[i].sock != NONE ) return i;
+ /* Send ERROR to client (see RFC!) */
+ if (FwdMsg)
+ Conn_WriteStr(Idx, "ERROR :%s", FwdMsg);
+ else
+ Conn_WriteStr(Idx, "ERROR :Closing connection.");
}
- return NONE;
-} /* Conn_First */
-
-
-GLOBAL CONN_ID
-Conn_Next( CONN_ID Idx )
-{
- /* Naechste Verbindungs-Struktur liefern; existiert keine
- * weitere, so wird NONE geliefert. */
- LONG i = NONE;
+ /* Try to write out the write buffer */
+ (void)Handle_Write( Idx );
- assert( Idx > NONE );
-
- for( i = Idx + 1; i < Pool_Size; i++ )
+ /* Shut down socket */
+ if( ! io_close( My_Connections[Idx].sock ))
{
- if( My_Connections[i].sock != NONE ) return i;
+ /* Oops, we can't close the socket!? This is ... ugly! */
+ Log( LOG_CRIT, "Error closing connection %d (socket %d) with %s:%d - %s! (ignored)", Idx, My_Connections[Idx].sock, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port), strerror( errno ));
}
- return NONE;
-} /* Conn_Next */
-
-
-GLOBAL VOID
-Conn_SetServer( CONN_ID Idx, INT ConfServer )
-{
- /* Connection als Server markieren: Index des konfigurierten
- * Servers speichern. Verbindung muss bereits bestehen! */
-
- assert( Idx > NONE );
- assert( My_Connections[Idx].sock > NONE );
-
- My_Connections[Idx].our_server = ConfServer;
-} /* Conn_SetServer */
-
-GLOBAL VOID
-Conn_SetOption( CONN_ID Idx, INT Option )
-{
- /* Option fuer Verbindung setzen.
- * Initial sind alle Optionen _nicht_ gesetzt. */
-
- assert( Idx > NONE );
- assert( Option != 0 );
-
- My_Connections[Idx].options |= Option;
-} /* Conn_SetOption */
-
-
-GLOBAL VOID
-Conn_UnsetOption( CONN_ID Idx, INT Option )
-{
- /* Option fuer Verbindung loeschen */
-
- assert( Idx > NONE );
- assert( Option != 0 );
-
- My_Connections[Idx].options &= ~Option;
-} /* Conn_UnsetOption */
-
-
-GLOBAL INT
-Conn_Options( CONN_ID Idx )
-{
- assert( Idx > NONE );
- return My_Connections[Idx].options;
-} /* Conn_Options */
-
-
-#ifdef USE_ZLIB
-
-GLOBAL BOOLEAN
-Conn_InitZip( CONN_ID Idx )
-{
- /* Kompression fuer Link initialisieren */
-
- assert( Idx > NONE );
-
- My_Connections[Idx].zip.in.avail_in = 0;
- My_Connections[Idx].zip.in.total_in = 0;
- My_Connections[Idx].zip.in.total_out = 0;
- My_Connections[Idx].zip.in.zalloc = NULL;
- My_Connections[Idx].zip.in.zfree = NULL;
- My_Connections[Idx].zip.in.data_type = Z_ASCII;
+ /* Mark socket as invalid: */
+ My_Connections[Idx].sock = NONE;
- if( inflateInit( &My_Connections[Idx].zip.in ) != Z_OK )
- {
- /* Fehler! */
- Log( LOG_ALERT, "Can't initialize compression on connection %d (zlib inflate)!", Idx );
- return FALSE;
+ /* 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 ( Conn_OPTION_ISSET( &My_Connections[Idx], 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 );
}
-
- My_Connections[Idx].zip.out.total_in = 0;
- My_Connections[Idx].zip.out.total_in = 0;
- My_Connections[Idx].zip.out.zalloc = NULL;
- My_Connections[Idx].zip.out.zfree = NULL;
- My_Connections[Idx].zip.out.data_type = Z_ASCII;
-
- if( deflateInit( &My_Connections[Idx].zip.out, Z_DEFAULT_COMPRESSION ) != Z_OK )
+ else
+#endif
{
- /* Fehler! */
- Log( LOG_ALERT, "Can't initialize compression on connection %d (zlib deflate)!", Idx );
- return FALSE;
+ 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 );
}
- My_Connections[Idx].zip.bytes_in = My_Connections[Idx].bytes_in;
- My_Connections[Idx].zip.bytes_out = My_Connections[Idx].bytes_out;
-
- Log( LOG_INFO, "Enabled link compression (zlib) on connection %d.", Idx );
- Conn_SetOption( Idx, CONN_ZIP );
+ /* Is there a resolver sub-process running? */
+ if( My_Connections[Idx].res_stat )
+ FreeRes_stat( &My_Connections[Idx] );
- return TRUE;
-} /* Conn_InitZip */
+ /* Servers: Modify time of next connect attempt? */
+ Conf_UnsetServer( Idx );
+#ifdef ZLIB
+ /* Clean up zlib, if link was compressed */
+ if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) {
+ inflateEnd( &My_Connections[Idx].zip.in );
+ deflateEnd( &My_Connections[Idx].zip.out );
+ array_free(&My_Connections[Idx].zip.rbuf);
+ array_free(&My_Connections[Idx].zip.wbuf);
+ }
#endif
+ array_free(&My_Connections[Idx].rbuf);
+ array_free(&My_Connections[Idx].wbuf);
+ /* Clean up connection structure (=free it) */
+ Init_Conn_Struct( Idx );
-LOCAL BOOLEAN
-Try_Write( CONN_ID Idx )
-{
- /* Versuchen, Daten aus dem Schreib-Puffer in den
- * Socket zu schreiben. */
-
- fd_set write_socket;
- struct timeval tv;
-
- assert( Idx > NONE );
- assert( My_Connections[Idx].sock > NONE );
- assert( My_Connections[Idx].wdatalen > 0 );
-
- /* 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, &tv ) == -1 )
- {
- /* Fehler! */
- if( errno != EINTR )
- {
- 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;
-} /* Try_Write */
+#ifdef DEBUG
+ Log( LOG_DEBUG, "Shutdown of connection %d completed.", Idx );
+#endif
+} /* Conn_Close */
-LOCAL VOID
-Handle_Read( INT Sock )
+GLOBAL void
+Conn_SyncServerStruct( void )
{
- /* Aktivitaet auf einem Socket verarbeiten:
- * - neue Clients annehmen,
- * - Daten von Clients verarbeiten,
- * - Resolver-Rueckmeldungen annehmen. */
-
- CONN_ID idx;
+ /* Synchronize server structures (connection IDs):
+ * connections <-> configuration */
- assert( Sock > NONE );
+ CLIENT *client;
+ CONN_ID i;
+ int c;
- if( FD_ISSET( Sock, &My_Listeners ))
+ for( i = 0; i < Pool_Size; i++ )
{
- /* es ist einer unserer Listener-Sockets: es soll
- * also eine neue Verbindung aufgebaut werden. */
+ /* Established connection? */
+ if( My_Connections[i].sock <= NONE ) continue;
- New_Connection( Sock );
- }
- else if( FD_ISSET( Sock, &Resolver_FDs ))
- {
- /* Rueckmeldung von einem Resolver Sub-Prozess */
+ /* Server connection? */
+ client = Client_GetFromConn( i );
+ if(( ! client ) || ( Client_Type( client ) != CLIENT_SERVER )) continue;
- Read_Resolver_Result( Sock );
- }
- else
- {
- /* Ein Client Socket: entweder ein User oder Server */
+ for( c = 0; c < MAX_SERVERS; c++ )
+ {
+ /* Configured server? */
+ if( ! Conf_Server[c].host[0] ) continue;
- idx = Socket2Index( Sock );
- if( idx > NONE ) Read_Request( idx );
+ /* Duplicate? */
+ if( strcmp( Conf_Server[c].name, Client_ID( client )) == 0 ) Conf_Server[c].conn_id = i;
+ }
}
-} /* Handle_Read */
+} /* SyncServerStruct */
-LOCAL BOOLEAN
+static bool
Handle_Write( CONN_ID Idx )
{
/* Daten aus Schreibpuffer versenden bzw. Connection aufbauen */
- INT len, res, err;
+ int len;
+ unsigned int wdatalen;
+ Log(LOG_DEBUG, "Handle_Write");
assert( Idx > NONE );
+ if ( My_Connections[Idx].sock < 0 ) {
+ Log(LOG_WARNING, "Handle_Write() on closed socket, idx %d", Idx);
+ return false;
+ }
assert( My_Connections[Idx].sock > NONE );
- if( FD_ISSET( My_Connections[Idx].sock, &My_Connects ))
- {
- /* es soll nichts geschrieben werden, sondern ein
- * connect() hat ein Ergebnis geliefert */
-
- 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 ));
-
- /* 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 ));
-
- /* Socket etc. pp. aufraeumen */
- FD_CLR( My_Connections[Idx].sock, &My_Sockets );
- 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 );
-
- 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 %s", Conf_Server[My_Connections[Idx].our_server].pwd_out, NGIRCd_ProtoID );
- return Conn_WriteStr( Idx, "SERVER %s :%s", Conf_ServerName, Conf_ServerInfo );
+ wdatalen = array_bytes(&My_Connections[Idx].wbuf );
+#ifdef ZLIB
+ if(( wdatalen == 0 ) && ( ! array_bytes(&My_Connections[Idx].zip.wbuf))) {
+ io_event_del(My_Connections[Idx].sock, IO_WANTWRITE );
+ return true;
}
-#ifdef USE_ZLIB
- /* Schreibpuffer leer, aber noch Daten im Kompressionsbuffer?
- * Dann muss dieser nun geflushed werden! */
- if( My_Connections[Idx].wdatalen == 0 ) Zip_Flush( Idx );
+ /* write buffer empty, but not compression buf? -> flush compression buf. */
+ if( wdatalen == 0 ) Zip_Flush( Idx );
+#else
+ if( wdatalen == 0 ) {
+ io_event_del(My_Connections[Idx].sock, IO_WANTWRITE );
+ return true;
+ }
#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;
+ wdatalen = array_bytes(&My_Connections[Idx].wbuf ); /* Zip_Flush may change wbuf */
+ len = write( My_Connections[Idx].sock, array_start(&My_Connections[Idx].wbuf), wdatalen );
+ if( len < 0 ) {
+ if( errno == EAGAIN || errno == EINTR)
+ return true;
- /* Oops, ein Fehler! */
- 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;
+ 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 );
+ /* move any data not yet written to beginning */
+ array_moveleft(&My_Connections[Idx].wbuf, 1, len);
- return TRUE;
+ return true;
} /* Handle_Write */
-LOCAL VOID
-New_Connection( INT Sock )
+static int
+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;
CLIENT *c;
POINTER *ptr;
- LONG new_size;
+ 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 )
{
Log( LOG_CRIT, "Can't accept connection: %s!", strerror( errno ));
- return;
+ return -1;
+ }
+
+#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! */
+ 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 -1;
}
+#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 -1;
+ }
/* 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 */
{
/* 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;
+ return -1;
}
if( new_size > Conf_MaxConnections ) new_size = Conf_MaxConnections;
}
-
- /* 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 );
- if( ! ptr )
+ if( new_size < Pool_Size )
{
- /* 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]" );
- close( new_sock );
- return;
- }
-
- /* Struktur umkopieren ... */
- memcpy( ptr, My_Connections, sizeof( CONNECTION ) * Pool_Size );
-
- Log( LOG_DEBUG, "Allocated new connection pool for %ld items. [malloc()/memcpy()]", new_size );
+ Log( LOG_ALERT, "Can't accept connection: limit (%d) reached -- overflow!", Pool_Size );
+ Simple_Message( new_sock, "ERROR :Connection limit reached" );
+ close( new_sock );
+ return -1;
}
- else Log( LOG_DEBUG, "Allocated new connection pool for %ld items. [realloc()]", new_size );
-
- My_Connections = ptr;
+
+ 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 -1;
+ }
+
+#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 */
- c = Client_NewLocal( idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWN, FALSE );
- if( ! c )
- {
+ 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;
+ return -1;
}
/* Verbindung registrieren */
My_Connections[idx].addr = new_addr;
/* Neuen Socket registrieren */
- FD_SET( new_sock, &My_Sockets );
- if( new_sock > Conn_MaxFD ) Conn_MaxFD = new_sock;
+ if (!io_event_create( new_sock, IO_WANTREAD, cb_clientserver)) {
+ Simple_Message( new_sock, "ERROR :Internal error" );
+ Conn_Close( idx, "io_event_create() failed", NULL, false );
+ return -1;
+ }
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 */
- strcpy( My_Connections[idx].host, inet_ntoa( new_addr.sin_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 );
- if( s )
- {
- /* Sub-Prozess wurde asyncron gestartet */
- Conn_WriteStr( idx, "NOTICE AUTH :%sLooking up your hostname ...", NOTICE_TXTPREFIX );
- My_Connections[idx].res_stat = s;
- }
-
+#endif
+ /* resolver process has been started */
+ if( s ) My_Connections[idx].res_stat = s;
+
/* Penalty-Zeit setzen */
Conn_SetPenalty( idx, 4 );
+ return new_sock;
} /* New_Connection */
-LOCAL CONN_ID
-Socket2Index( INT Sock )
+static CONN_ID
+Socket2Index( int Sock )
{
/* zum Socket passende Connection suchen */
{
/* 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
+static void
Read_Request( CONN_ID Idx )
{
/* Daten von Socket einlesen und entsprechend behandeln.
* Tritt ein Fehler auf, so wird der Socket geschlossen. */
- INT len, bsize;
- CLIENT *c;
+ int len;
+ char readbuf[1024];
assert( Idx > NONE );
assert( My_Connections[Idx].sock > NONE );
- /* wenn noch nicht registriert: maximal mit ZREADBUFFER_LEN arbeiten,
- * ansonsten koennen Daten ggf. nicht umkopiert werden. */
- bsize = READBUFFER_LEN;
-#ifdef USE_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
- if(( bsize - My_Connections[Idx].rdatalen - 1 < 1 ) || ( ZREADBUFFER_LEN - My_Connections[Idx].zip.rdatalen < 1 ))
+#ifdef ZLIB
+ if (( array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN ) ||
+ ( array_bytes(&My_Connections[Idx].zip.rbuf) >= ZREADBUFFER_LEN ))
#else
- if( bsize - My_Connections[Idx].rdatalen - 1 < 1 )
+ if ( array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN )
#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,
+ array_bytes(&My_Connections[Idx].rbuf));
+ Conn_Close( Idx, "Receive buffer overflow!", NULL, false );
return;
}
-#ifdef USE_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 );
+ len = read( My_Connections[Idx].sock, readbuf, sizeof readbuf -1 );
+ if( len == 0 ) {
+ 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( len < 0 ) {
if( errno == EAGAIN ) return;
-
- /* Fehler beim Lesen */
- 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 );
+ 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;
}
+#ifdef ZLIB
+ if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) {
+ if (!array_catb( &My_Connections[Idx].zip.rbuf, readbuf, len)) {
+ Log( LOG_ERR, "Could not append recieved data to zip input buffer (connn %d): %d bytes!", Idx, len );
+ Conn_Close( Idx, "Receive buffer overflow!", NULL, false );
+ return;
+ }
+ } else
+#endif
+ {
+ readbuf[len] = 0;
+ if (!array_cats( &My_Connections[Idx].rbuf, readbuf )) {
+ Log( LOG_ERR, "Could not append recieved data to input buffer (connn %d): %d bytes!", Idx, len );
+ Conn_Close( Idx, "Receive buffer overflow!", NULL, false );
+ }
+ }
/* Connection-Statistik aktualisieren */
My_Connections[Idx].bytes_in += len;
} /* Read_Request */
-LOCAL BOOLEAN
+static bool
Handle_Buffer( CONN_ID Idx )
{
- /* Daten im Lese-Puffer einer Verbindung verarbeiten.
- * Wurde ein Request verarbeitet, so wird TRUE geliefert,
- * ansonsten FALSE (auch bei Fehlern). */
-
+ /* Handle Data in Connections Read-Buffer.
+ * Return true if a reuqest was handled, false otherwise (also returned on errors). */
#ifndef STRICT_RFC
- CHAR *ptr1, *ptr2;
+ char *ptr1, *ptr2;
#endif
- CHAR *ptr;
- INT len, delta;
- BOOLEAN action, result;
-#ifdef USE_ZLIB
- BOOLEAN old_z;
+ char *ptr;
+ int len, delta;
+ bool action, result;
+#ifdef ZLIB
+ bool old_z;
#endif
- result = FALSE;
- do
- {
-#ifdef USE_ZLIB
- /* ggf. noch unkomprimiete Daten weiter entpacken */
- if( My_Connections[Idx].options & CONN_ZIP )
- {
- if( ! Unzip_Buffer( Idx )) return FALSE;
- }
+ result = false;
+ do {
+ /* Check penalty */
+ if( My_Connections[Idx].delaytime > time( NULL )) return result;
+#ifdef ZLIB
+ /* unpack compressed data */
+ if ( Conn_OPTION_ISSET( &My_Connections[Idx], 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;
+ if (0 == array_bytes(&My_Connections[Idx].rbuf))
+ break;
+
+ if (!array_cat0_temporary(&My_Connections[Idx].rbuf)) /* make sure buf is NULL terminated */
+ return false;
+
+ /* A Complete Request end with CR+LF, see RFC 2812. */
+ ptr = strstr( array_start(&My_Connections[Idx].rbuf), "\r\n" );
+
+ if( ptr ) delta = 2; /* complete request */
#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' );
+ else {
+ /* Check for non-RFC-compliant request (only CR or LF)? Unfortunately,
+ * there are quite a few clients that do this (incl. "mIRC" :-( */
+ ptr1 = strchr( array_start(&My_Connections[Idx].rbuf), '\r' );
+ ptr2 = strchr( array_start(&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
-
- 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 USE_ZLIB
- /* merken, ob Stream bereits komprimiert wird */
- old_z = My_Connections[Idx].options & CONN_ZIP;
-#endif
+ action = false;
+ if( ! ptr )
+ break;
- if( len > delta )
- {
- /* Es wurde ein Request gelesen */
- if( ! Parse_Request( Idx, My_Connections[Idx].rbuf )) return FALSE;
- else action = TRUE;
- }
+ /* End of request found */
+ *ptr = '\0';
- /* Puffer anpassen */
- My_Connections[Idx].rdatalen -= len;
- memmove( My_Connections[Idx].rbuf, My_Connections[Idx].rbuf + len, My_Connections[Idx].rdatalen );
+ len = ( ptr - (char*) array_start(&My_Connections[Idx].rbuf)) + delta;
-#ifdef USE_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 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 );
- }
- }
+ if( len < 0 || len > ( COMMAND_LEN - 1 )) {
+ /* Request must not exceed 512 chars (incl. CR+LF!), see
+ * RFC 2812. Disconnect Client if this happens. */
+ Log( LOG_ERR, "Request too long (connection %d): %d bytes (max. %d expected)!",
+ Idx, array_bytes(&My_Connections[Idx].rbuf), COMMAND_LEN - 1 );
+ Conn_Close( Idx, NULL, "Request too long", true );
+ return false;
+ }
+
+#ifdef ZLIB
+ /* remember if stream is already compressed */
+ old_z = My_Connections[Idx].options & CONN_ZIP;
+#endif
+
+ if( len > delta )
+ {
+ /* A Request was read */
+ My_Connections[Idx].msg_in++;
+ if( ! Parse_Request( Idx, (char*)array_start(&My_Connections[Idx].rbuf) )) return false;
+ else action = true;
+
+ array_moveleft(&My_Connections[Idx].rbuf, 1, len);
+#ifdef DEBUG
+ Log(LOG_DEBUG, "%d byte left in rbuf", array_bytes(&My_Connections[Idx].rbuf));
#endif
}
-
- if( action ) result = TRUE;
+
+#ifdef ZLIB
+ if(( ! old_z ) && ( My_Connections[Idx].options & CONN_ZIP ) && ( array_bytes(&My_Connections[Idx].rbuf) > 0 ))
+ {
+ /* The last Command activated Socket-Compression.
+ * Data that was read after that needs to be copied to Unzip-buf
+ * for decompression */
+ if( array_bytes(&My_Connections[Idx].rbuf)> ZREADBUFFER_LEN ) {
+ /* No space left */
+ Log( LOG_ALERT, "Can't move receive buffer: No space left in unzip buffer (need %d bytes)!", array_bytes(&My_Connections[Idx].rbuf ));
+ return false;
+ }
+ if (!array_copy( &My_Connections[Idx].zip.rbuf, &My_Connections[Idx].rbuf ))
+ return false;
+
+ array_trunc(&My_Connections[Idx].rbuf);
+#ifdef DEBUG
+ Log( LOG_DEBUG, "Moved already received data (%d bytes) to uncompression buffer.", array_bytes(&My_Connections[Idx].zip.rbuf));
+#endif /* DEBUG */
+ }
+#endif /* ZLIB */
+ if( action ) result = true;
} while( action );
-
+
return result;
} /* Handle_Buffer */
-LOCAL VOID
-Check_Connections( VOID )
+static 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. */
-
+ /* check if connections are alive. if not, play PING-PONG first.
+ * if this doesn't help either, disconnect client. */
CLIENT *c;
- LONG i;
+ CONN_ID i;
- for( i = 0; i < Pool_Size; i++ )
- {
+ for( i = 0; i < Pool_Size; i++ ) {
if( My_Connections[i].sock == NONE ) continue;
c = Client_GetFromConn( i );
if( c && (( Client_Type( c ) == CLIENT_USER ) || ( Client_Type( c ) == CLIENT_SERVER ) || ( Client_Type( c ) == CLIENT_SERVICE )))
{
- /* verbundener User, Server oder Service */
- if( My_Connections[i].lastping > My_Connections[i].lastdata )
- {
- /* es wurde bereits ein PING gesendet */
- if( My_Connections[i].lastping < time( NULL ) - Conf_PongTimeout )
- {
+ /* connected User, Server or Service */
+ if( My_Connections[i].lastping > My_Connections[i].lastdata ) {
+ /* we already sent a ping */
+ if( My_Connections[i].lastping < time( NULL ) - Conf_PongTimeout ) {
/* Timeout */
+#ifdef DEBUG
Log( LOG_DEBUG, "Connection %d: Ping timeout: %d seconds.", i, Conf_PongTimeout );
- Conn_Close( i, NULL, "Ping timeout", TRUE );
+#endif
+ Conn_Close( i, NULL, "Ping timeout", true );
}
}
- else if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout )
- {
- /* es muss ein PING gesendet werden */
+ else if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout ) {
+ /* we need to sent a PING */
+#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( )));
}
}
else
{
- /* noch nicht vollstaendig aufgebaute Verbindung */
+ /* connection is not fully established yet */
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 )
+static void
+Check_Servers( void )
{
- /* Pruefen, ob Server-Verbindungen aufgebaut werden
- * muessen bzw. koennen */
+ /* Check if we can establish further server links */
RES_STAT *s;
- LONG idx, n;
- INT i;
-
- /* Wenn "Passive-Mode" aktiv: nicht verbinden */
- if( NGIRCd_Passive ) return;
+ CONN_ID idx;
+ int i, n;
- for( i = 0; i < Conf_Server_Count; i++ )
+ /* Serach all connections, are there results from the resolver? */
+ for( idx = 0; idx < Pool_Size; idx++ )
{
- /* Ist ein Hostname und Port definiert? */
- if(( ! Conf_Server[i].host[0] ) || ( ! Conf_Server[i].port > 0 )) continue;
+ if( My_Connections[idx].sock != SERVER_WAIT ) continue;
- /* Haben wir schon eine Verbindung? */
- for( n = 0; n < Pool_Size; n++ )
- {
- if( My_Connections[n].sock == NONE ) continue;
-
- /* Verbindung zu diesem Server? */
- if( My_Connections[n].our_server == i )
- {
- /* Komplett aufgebaute Verbindung? */
- if( My_Connections[n].sock > NONE ) break;
+ /* IP resolved? */
+ if( My_Connections[idx].res_stat == NULL ) New_Server( Conf_GetServer( idx ), idx );
+ }
- /* IP schon aufgeloest? */
- if( My_Connections[n].res_stat == NULL ) New_Server( i, n );
- }
+ /* Check all configured servers */
+ for( i = 0; i < MAX_SERVERS; i++ )
+ {
+ /* Valid outgoing server which isn't already connected or disabled? */
+ if(( ! Conf_Server[i].host[0] ) || ( ! Conf_Server[i].port > 0 ) || ( Conf_Server[i].conn_id > NONE ) || ( Conf_Server[i].flags & CONF_SFLAG_DISABLED )) continue;
- /* Verbindung in dieser Server-Gruppe? */
- if(( My_Connections[n].our_server != NONE ) && ( Conf_Server[i].group != NONE ))
+ /* Is there already a connection in this group? */
+ if( Conf_Server[i].group > NONE )
+ {
+ for( n = 0; n < MAX_SERVERS; n++ )
{
- if( Conf_Server[My_Connections[n].our_server].group == Conf_Server[i].group ) break;
+ if( n == i ) continue;
+ if(( Conf_Server[n].conn_id > NONE ) && ( Conf_Server[n].group == Conf_Server[i].group )) break;
}
+ if( n < MAX_SERVERS ) continue;
}
- if( n < Pool_Size ) continue;
- /* Wann war der letzte Connect-Versuch? */
+ /* Check last connect attempt? */
if( Conf_Server[i].lasttry > time( NULL ) - Conf_ConnectRetry ) continue;
- /* Okay, Verbindungsaufbau versuchen */
+ /* Okay, try to connect now */
Conf_Server[i].lasttry = time( NULL );
- /* Freie Connection-Struktur suschen */
+ /* Search free connection structure */
for( idx = 0; idx < Pool_Size; idx++ ) if( My_Connections[idx].sock == NONE ) break;
if( idx >= Pool_Size )
{
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;
+ Conf_Server[i].conn_id = idx;
- /* Hostnamen in IP aufloesen (Default bzw. im Fehlerfall: versuchen, den
- * konfigurierten Text direkt als IP-Adresse zu verwenden ... */
- strcpy( Conf_Server[My_Connections[idx].our_server].ip, Conf_Server[i].host );
- strcpy( My_Connections[idx].host, Conf_Server[i].host );
+ /* 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;
- }
+
+ /* resolver process running? */
+ if( s ) My_Connections[idx].res_stat = s;
}
} /* Check_Servers */
-LOCAL VOID
-New_Server( INT Server, CONN_ID Idx )
+static 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 res, new_sock;
+ int res, new_sock;
CLIENT *c;
assert( Server > NONE );
assert( Idx > NONE );
- /* Wurde eine gueltige IP-Adresse gefunden? */
- if( ! Conf_Server[Server].ip[0] )
- {
- /* Nein. Verbindung wieder freigeben: */
- Init_Conn_Struct( Idx );
+ /* Did we get a valid IP address? */
+ if( ! Conf_Server[Server].ip[0] ) {
+ /* No. Free connection structure and abort: */
Log( LOG_ERR, "Can't connect to \"%s\" (connection %d): ip address unknown!", Conf_Server[Server].host, Idx );
- return;
+ goto out;
}
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 );
if( inaddr.s_addr == (unsigned)-1 )
#endif
{
- /* Konnte Adresse nicht konvertieren */
- Init_Conn_Struct( Idx );
+ /* Can't convert IP address */
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;
+ goto out;
}
memset( &new_addr, 0, sizeof( new_addr ));
new_addr.sin_port = htons( Conf_Server[Server].port );
new_sock = socket( PF_INET, SOCK_STREAM, 0 );
- if ( new_sock < 0 )
- {
- Init_Conn_Struct( Idx );
+ if ( new_sock < 0 ) {
+ /* Can't create socket */
Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
- return;
+ goto out;
}
if( ! Init_Socket( new_sock )) return;
res = connect( new_sock, (struct sockaddr *)&new_addr, sizeof( new_addr ));
- if(( res != 0 ) && ( errno != EINPROGRESS ))
- {
+ 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 );
- return;
+ goto out;
}
/* Client-Struktur initialisieren */
- c = Client_NewLocal( Idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWNSERVER, FALSE );
- if( ! c )
- {
- close( new_sock );
- Init_Conn_Struct( Idx );
+ c = Client_NewLocal( Idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWNSERVER, false );
+ if( ! c ) {
+ /* Can't create new client structure */
Log( LOG_ALERT, "Can't establish connection: can't create client structure!" );
- return;
+ close( new_sock );
+ goto out;
}
+
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 */
- FD_SET( new_sock, &My_Sockets );
- FD_SET( new_sock, &My_Connects );
- if( new_sock > Conn_MaxFD ) Conn_MaxFD = new_sock;
-
+ /* Register new socket */
+ if (!io_event_create( new_sock, IO_WANTWRITE, cb_connserver)) {
+ Log( LOG_ALERT, "io_event_create(): could not add fd %d", strerror(errno));
+ Conn_Close( Idx, "io_event_create() failed", NULL, false );
+ goto out;
+ }
+
+#ifdef DEBUG
Log( LOG_DEBUG, "Registered new connection %d on socket %d.", Idx, My_Connections[Idx].sock );
+#endif
+ Conn_OPTION_ADD( &My_Connections[Idx], CONN_ISCONNECTING );
+ return;
+out:
+ Init_Conn_Struct( Idx );
+ Conf_Server[Server].conn_id = NONE;
} /* New_Server */
-LOCAL VOID
-Init_Conn_Struct( LONG Idx )
+static void
+Init_Conn_Struct( CONN_ID Idx )
{
+ time_t now = time( NULL );
/* Connection-Struktur initialisieren */
+ memset( &My_Connections[Idx], 0, sizeof ( CONNECTION ));
My_Connections[Idx].sock = NONE;
- My_Connections[Idx].res_stat = NULL;
- My_Connections[Idx].host[0] = '\0';
- My_Connections[Idx].rbuf[0] = '\0';
- 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].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].flag = 0;
- My_Connections[Idx].options = 0;
-
-#ifdef USE_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
+ My_Connections[Idx].lastdata = now;
+ My_Connections[Idx].lastprivmsg = now;
} /* Init_Conn_Struct */
-LOCAL BOOLEAN
-Init_Socket( INT Sock )
+static bool
+Init_Socket( int Sock )
{
- /* Socket-Optionen setzen */
+ /* Initialize socket (set options) */
- INT on = 1;
+ int value;
-#ifdef O_NONBLOCK /* A/UX kennt das nicht? */
- if( fcntl( Sock, F_SETFL, O_NONBLOCK ) != 0 )
- {
- Log( LOG_CRIT, "Can't enable non-blocking mode: %s!", strerror( errno ));
+ if (!io_setnonblock(Sock)) {
+ Log( LOG_CRIT, "Can't enable non-blocking mode for socket: %s!", strerror( errno ));
close( Sock );
- return FALSE;
+ return false;
+ }
+
+ /* 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 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_SOCKET, SO_REUSEADDR, &on, (socklen_t)sizeof( on )) != 0)
+ if( setsockopt( Sock, SOL_IP, IP_TOS, &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 IP_TOS: %s!", strerror( errno ));
+ /* ignore this error */
}
+#endif
- return TRUE;
+ return true;
} /* Init_Socket */
-LOCAL VOID
-Read_Resolver_Result( INT r_fd )
+GLOBAL
+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;
-
- 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';
+ int bytes_read, i, n;
+ unsigned int len;
+ RES_STAT *s;
+ char *ptr;
+ char *bufptr;
+ char readbuf[HOST_LEN];
- /* zugehoerige Connection suchen */
+ Log( LOG_DEBUG, "Resolver: started, fd %d", r_fd );
+ /* 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. */
- close( r_fd );
+ /* Ops, none found? Probably the connection has already
+ * been closed!? We'll ignore that ... */
+ io_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 */
+ bytes_read = read( r_fd, readbuf, sizeof readbuf -1 );
+ if( bytes_read < 0 ) {
+ /* Error! */
+ Log( LOG_CRIT, "Resolver: Can't read result: %s!", strerror( errno ));
+ FreeRes_stat( &My_Connections[i] );
+ return;
+ }
+ len = (unsigned int) bytes_read;
+ readbuf[len] = '\0';
+ if (!array_catb(&s->buffer, readbuf, len)) {
+ Log( LOG_CRIT, "Resolver: Can't append result %s to buffer: %s", readbuf, strerror( errno ));
+ FreeRes_stat(&My_Connections[i]);
+ return;
+ }
+
+ if (!array_cat0_temporary(&s->buffer)) {
+ Log( LOG_CRIT, "Resolver: Can't append result %s to buffer: %s", readbuf, strerror( errno ));
+ FreeRes_stat(&My_Connections[i]);
+ return;
+ }
+
+ /* If the result string is incomplete, return to main loop and
+ * wait until we can read in more bytes. */
+#ifdef IDENTAUTH
+try_resolve:
+#endif
+ bufptr = (char*) array_start(&s->buffer);
+ assert(bufptr != NULL);
+ ptr = strchr( bufptr, '\n' );
+ if( ! ptr ) return;
+ *ptr = '\0';
+
+#ifdef DEBUG
+ Log( LOG_DEBUG, "Got result from resolver: \"%s\" (%u bytes read), stage %d.", bufptr, 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 connections.*/
if( My_Connections[i].sock > NONE )
{
- /* Eingehende Verbindung: Hostnamen setzen */
+ /* Incoming connection. Search client ... */
c = Client_GetFromConn( i );
assert( c != NULL );
- strcpy( My_Connections[i].host, result );
- Client_SetHostname( c, result );
- Conn_WriteStr( i, "NOTICE AUTH :%sGot your hostname.", NOTICE_TXTPREFIX );
+ /* Only update client information of unregistered clients */
+ if( Client_Type( c ) == CLIENT_UNKNOWN )
+ {
+ switch(s->stage) {
+ case 0: /* host name */
+ strlcpy( My_Connections[i].host, bufptr, sizeof( My_Connections[i].host));
+
+ Client_SetHostname( c, bufptr);
+#ifdef IDENTAUTH
+ /* clean up buffer for IDENT result */
+ len = strlen(bufptr) + 1;
+ assert(len <= array_bytes(&s->buffer));
+ array_moveleft(&s->buffer, 1, len);
+
+ /* Don't close pipe and clean up, but
+ * instead wait for IDENT result */
+ s->stage = 1;
+ goto try_resolve;
+
+ case 1: /* IDENT user name */
+ if (array_bytes(&s->buffer)) {
+ bufptr = (char*) array_start(&s->buffer);
+ Log( LOG_INFO, "IDENT lookup for connection %ld: \"%s\".", i, bufptr);
+ Client_SetUser( c, bufptr, true );
+ }
+ else Log( LOG_INFO, "IDENT lookup for connection %ld: no result.", i );
+#endif
+ break;
+ default:
+ 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 */
- assert( My_Connections[i].our_server > NONE );
- strcpy( Conf_Server[My_Connections[i].our_server].ip, result );
- }
-
- /* Penalty-Zeit zurueck setzen */
- Conn_ResetPenalty( i );
-} /* Read_Resolver_Result */
-
-
-#ifdef USE_ZLIB
+ /* Outgoing connection (server link): set the IP address
+ * so that we can connect to it in the main loop. */
-LOCAL BOOLEAN
-Zip_Buffer( CONN_ID Idx, CHAR *Data, INT Len )
-{
- /* Daten zum Komprimieren im "Kompressions-Puffer" sammeln.
- * Es wird TRUE bei Erfolg, sonst FALSE geliefert. */
-
- assert( Idx > NONE );
- assert( Data != NULL );
- assert( Len > 0 );
+ /* Search server ... */
+ n = Conf_GetServer( i );
+ assert( n > NONE );
- /* Ist noch Platz im Kompressions-Puffer? */
- if( ZWRITEBUFFER_LEN - My_Connections[Idx].zip.wdatalen < Len + 50 )
- {
- /* Nein! Puffer zunaechst leeren ...*/
- if( ! Zip_Flush( Idx )) return FALSE;
+ bufptr = (char*) array_start(&s->buffer);
+ strlcpy( Conf_Server[n].ip, bufptr, sizeof( Conf_Server[n].ip ));
}
- /* Daten kopieren */
- memmove( My_Connections[Idx].zip.wbuf + My_Connections[Idx].zip.wdatalen, Data, Len );
- My_Connections[Idx].zip.wdatalen += Len;
+ /* Clean up ... */
+ FreeRes_stat( &My_Connections[i] );
- return TRUE;
-} /* Zip_Buffer */
+ /* Reset penalty time */
+ Conn_ResetPenalty( i );
+} /* Read_Resolver_Result */
-LOCAL BOOLEAN
-Zip_Flush( CONN_ID Idx )
+static void
+Simple_Message( int Sock, char *Msg )
{
- /* Daten komprimieren und in Schreibpuffer kopieren.
- * Es wird TRUE bei Erfolg, sonst FALSE geliefert. */
-
- INT result, out_len;
- z_stream *out;
-
- out = &My_Connections[Idx].zip.out;
-
- out->next_in = My_Connections[Idx].zip.wbuf;
- out->avail_in = My_Connections[Idx].zip.wdatalen;
- out->next_out = My_Connections[Idx].wbuf + My_Connections[Idx].wdatalen;
- out->avail_out = WRITEBUFFER_LEN - My_Connections[Idx].wdatalen;
-
- result = deflate( out, Z_SYNC_FLUSH );
- if(( result != Z_OK ) || ( out->avail_in > 0 ))
- {
- Log( LOG_ALERT, "Compression error: code %d!?", result );
- Conn_Close( Idx, "Compression error!", NULL, FALSE );
- return FALSE;
- }
+ char buf[COMMAND_LEN];
+ /* 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 );
- out_len = WRITEBUFFER_LEN - My_Connections[Idx].wdatalen - out->avail_out;
- My_Connections[Idx].wdatalen += out_len;
- My_Connections[Idx].bytes_out += out_len;
- My_Connections[Idx].zip.bytes_out += My_Connections[Idx].zip.wdatalen;
- My_Connections[Idx].zip.wdatalen = 0;
-
- return TRUE;
-} /* Zip_Flush */
+ strlcpy( buf, Msg, sizeof buf - 2);
+ strlcat( buf, "\r\n", sizeof buf);
+ (void)write( Sock, buf, strlen( buf ) );
+} /* Simple_Error */
-LOCAL BOOLEAN
-Unzip_Buffer( CONN_ID Idx )
+static int
+Count_Connections( struct sockaddr_in addr_in )
{
- /* Daten entpacken und in Lesepuffer kopieren. Bei Fehlern
- * wird FALSE geliefert, ansonsten TRUE. Der Fall, dass keine
- * Daten mehr zu entpacken sind, ist _kein_ Fehler! */
-
- INT result, in_len, out_len;
- z_stream *in;
-
- assert( Idx > NONE );
-
- if( My_Connections[Idx].zip.rdatalen <= 0 ) return TRUE;
-
- in = &My_Connections[Idx].zip.in;
-
- in->next_in = My_Connections[Idx].zip.rbuf;
- in->avail_in = My_Connections[Idx].zip.rdatalen;
- in->next_out = My_Connections[Idx].rbuf + My_Connections[Idx].rdatalen;
- in->avail_out = READBUFFER_LEN - My_Connections[Idx].rdatalen - 1;
-
- result = inflate( in, Z_SYNC_FLUSH );
- if( result != Z_OK )
- {
- Log( LOG_ALERT, "Decompression error: code %d (ni=%d, ai=%d, no=%d, ao=%d)!?", result, in->next_in, in->avail_in, in->next_out, in->avail_out );
- Conn_Close( Idx, "Decompression error!", NULL, FALSE );
- return FALSE;
- }
-
- in_len = My_Connections[Idx].zip.rdatalen - in->avail_in;
- out_len = READBUFFER_LEN - My_Connections[Idx].rdatalen - 1 - in->avail_out;
- My_Connections[Idx].rdatalen += out_len;
-
- if( in->avail_in > 0 )
+ int i, cnt;
+
+ cnt = 0;
+ for( i = 0; i < Pool_Size; i++ )
{
- /* es konnten nicht alle Daten entpackt werden, vermutlich war
- * im Ziel-Puffer kein Platz mehr. Umkopieren ... */
- My_Connections[Idx].zip.rdatalen -= in_len;
- memmove( My_Connections[Idx].zip.rbuf, My_Connections[Idx].zip.rbuf + in_len, My_Connections[Idx].zip.rdatalen );
+ if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].addr.sin_addr.s_addr == addr_in.sin_addr.s_addr )) cnt++;
}
- else My_Connections[Idx].zip.rdatalen = 0;
- My_Connections[Idx].zip.bytes_in += out_len;
-
- return TRUE;
-} /* Unzip_Buffer */
+ return cnt;
+} /* Count_Connections */
-#endif
-
/* -eof- */
projects / ngircd-alex.git / blobdiff