/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-200
4 Alexander Barton <alex@barton.de>
+ * Copyright (c)2001-200
5 Alexander Barton <alex@barton.de>
*
* 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
#define CONN_MODULE
#include "portab.h"
+#include "io.h"
-static char UNUSED id[] = "$Id: conn.c,v 1.150 2005/05/22 23:55:58 alex Exp $";
+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 <stdlib.h>
#include <unistd.h>
#include <errno.h>
-#include <fcntl.h>
#include <string.h>
#include <sys/socket.h>
#include <sys/time.h>
# include <tcpd.h> /* for TCP Wrappers */
#endif
+#include "array.h"
#include "defines.h"
#include "resolve.h"
#include "parse.h"
#include "tool.h"
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
# include "rendezvous.h"
#endif
#define SERVER_WAIT (NONE - 1)
-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;
+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 );
+}
+
+
+static void
+cb_connserver(int sock, UNUSED short what)
+{
+ 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
+ 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 );
+}
+
+
+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] );
+
+ array_free(&c->res_stat->buffer);
+ free( c->res_stat );
+ c->res_stat = NULL;
+}
+
GLOBAL void
Conn_Init( void )
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 );
+ array_free( &My_Listeners );
/* Groesster File-Descriptor fuer select() */
Conn_MaxFD = 0;
* schliessen und freigeben. */
CONN_ID idx;
- int i;
#ifdef DEBUG
Log( LOG_DEBUG, "Shutting down all connections ..." );
#endif
-#ifdef RENDEZVOUS
- Rendezvous_UnregisterListeners( );
-#endif
+ Conn_ExitListeners();
/* Sockets schliessen */
- 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 );
-#ifdef DEBUG
- Log( LOG_DEBUG, "Listening socket %d closed.", 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
- {
- Log( LOG_WARNING, "Closing unknown connection %d ...", i );
- close( i );
- }
+ 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 */
+static unsigned int
+ports_initlisteners(array *a, void (*func)(int,short))
+{
+ 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;
+}
+
+
GLOBAL int
Conn_InitListeners( void )
{
/* Initialize ports on which the server should accept connections */
- int created, i;
+ unsigned int created;
- 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!", (unsigned int) Conf_ListenPorts[i] );
+ 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 */
Conn_ExitListeners( void )
{
/* Close down all listening sockets */
-
- int i;
-
-#ifdef RENDEZVOUS
+ 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 );
+ 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.", i );
+ 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 bool
-Conn_NewListener( const UINT16 Port )
+/* return new listening port file descriptor or -1 on failure */
+static int
+NewListener( const UINT16 Port )
{
/* Create new listening socket on specified port */
struct sockaddr_in addr;
struct in_addr inaddr;
int sock;
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
char name[CLIENT_ID_LEN], *info;
#endif
#endif
{
Log( LOG_CRIT, "Can't listen on %s:%u: can't convert ip address %s!", Conf_ListenAddress, Port, Conf_ListenAddress );
- return false;
+ return -1;
}
}
else inaddr.s_addr = htonl( INADDR_ANY );
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( sock > Conn_MaxFD ) Conn_MaxFD = sock;
+ 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 );
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
/* Get best server description text */
if( ! Conf_ServerInfo[0] ) info = Conf_ServerName;
else
else strlcpy( name, info, sizeof( name ));
/* Register service */
- Rendezvous_Register( name, RENDEZVOUS_TYPE, Port );
+ Rendezvous_Register( name, MDNS_TYPE, Port );
#endif
-
- return true;
-} /* Conn_NewListener */
+ return sock;
+} /* NewListener */
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;
- CONN_ID i, idx;
bool timeout;
start = time( NULL );
{
timeout = true;
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
Rendezvous_Handler( );
#endif
/* 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++ )
- {
+ for( i = 0; i < Pool_Size; i++ ) {
+ if ( My_Connections[i].sock <= NONE )
+ continue;
+
+ wdatalen = array_bytes(&My_Connections[i].wbuf);
+
#ifdef ZLIB
- if(( My_Connections[i].sock > NONE ) && (( My_Connections[i].wdatalen > 0 ) || ( My_Connections[i].zip.wdatalen > 0 )))
+ 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 ) {
- if ( Conn_OPTION_ISSET( &My_Connections[i], CONN_ISCONNECTING )) {
- FD_SET( My_Connections[i].sock, &write_sockets );
- }
+ /* von welchen Sockets koennte gelesen werden? */
+ 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;
}
- }
-
- /* von welchen Sockets koennte gelesen werden? */
- read_sockets = My_Sockets;
- for( i = 0; i < Pool_Size; i++ )
- {
- if ( My_Connections[i].sock > NONE ) {
- if ( My_Connections[i].host[0] == '\0' ) {
- /* wait for completion of Resolver Sub-Process */
- FD_CLR( My_Connections[i].sock, &read_sockets );
- continue;
- }
+ if ( Conn_OPTION_ISSET( &My_Connections[i], CONN_ISCONNECTING ))
+ continue; /* wait for completion of connect() */
- if ( Conn_OPTION_ISSET( &My_Connections[i], CONN_ISCONNECTING )) {
- /* wait for completion of connect() */
- FD_CLR( My_Connections[i].sock, &read_sockets );
- continue;
- }
- }
- if( My_Connections[i].delaytime > t )
- {
+ 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 < 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 */
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_NAME );
- 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 );
+ 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 );
}
}
} /* 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 bool
Conn_WriteStr( 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. */
-
char buffer[COMMAND_LEN];
bool ok;
va_list ap;
#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
strlcat( buffer, "\r\n", sizeof( buffer ));
GLOBAL bool
-Conn_Write( CONN_ID Idx, char *Data, int Len )
+Conn_Write( CONN_ID Idx, char *Data, unsigned int Len )
{
/* Daten in Socket schreiben. Bei "fatalen" Fehlern wird
* der Client disconnectiert und false geliefert. */
/* 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;
#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;
}
/* 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: Try_Write() failed -- see below. */
+ * probabe reason: Handle_Write() failed -- see below. */
#ifdef DEBUG
Log( LOG_DEBUG, "Recursive request to close connection: %d", Idx );
#endif
c = Client_GetFromConn( Idx );
/* Should the client be informed? */
- if( InformClient )
- {
+ 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 );
+ 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
/* Send ERROR to client (see RFC!) */
- if( FwdMsg ) Conn_WriteStr( Idx, "ERROR :%s", FwdMsg );
- else Conn_WriteStr( Idx, "ERROR :Closing connection." );
+ if (FwdMsg)
+ Conn_WriteStr(Idx, "ERROR :%s", FwdMsg);
+ else
+ Conn_WriteStr(Idx, "ERROR :Closing connection.");
}
/* Try to write out the write buffer */
- (void)Try_Write( Idx );
+ (void)Handle_Write( Idx );
/* Shut down socket */
- if( close( My_Connections[Idx].sock ) != 0 )
+ if( ! io_close( My_Connections[Idx].sock ))
{
/* 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 ));
}
/* Mark socket as invalid: */
- FD_CLR( My_Connections[Idx].sock, &My_Sockets );
My_Connections[Idx].sock = NONE;
/* If there is still a client, unregister it now */
/* Is there a resolver sub-process running? */
if( My_Connections[Idx].res_stat )
- {
- /* 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 );
- }
+ FreeRes_stat( &My_Connections[Idx] );
/* Servers: Modify time of next connect attempt? */
Conf_UnsetServer( Idx );
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 );
} /* SyncServerStruct */
-LOCAL bool
-Try_Write( CONN_ID Idx )
-{
- /* 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 > NONE );
- assert( My_Connections[Idx].sock > NONE );
-
- /* 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, &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 */
-
-
-LOCAL void
-Handle_Read( int Sock )
-{
- /* Aktivitaet auf einem Socket verarbeiten:
- * - neue Clients annehmen,
- * - Daten von Clients verarbeiten,
- * - Resolver-Rueckmeldungen annehmen. */
-
- CONN_ID idx;
-
- assert( Sock > NONE );
-
- if( FD_ISSET( Sock, &My_Listeners ))
- {
- /* es ist einer unserer Listener-Sockets: es soll
- * also eine neue Verbindung aufgebaut werden. */
-
- New_Connection( Sock );
- }
- else if( FD_ISSET( Sock, &Resolver_FDs ))
- {
- /* Rueckmeldung von einem Resolver Sub-Prozess */
-
- Read_Resolver_Result( Sock );
- }
- else
- {
- /* Ein Client Socket: entweder ein User oder Server */
-
- idx = Socket2Index( Sock );
- if( idx > NONE ) Read_Request( idx );
- }
-} /* Handle_Read */
-
-
-LOCAL bool
+static bool
Handle_Write( CONN_ID Idx )
{
/* Daten aus Schreibpuffer versenden bzw. Connection aufbauen */
- int len, res, err;
- socklen_t sock_len;
- CLIENT *c;
+ 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 ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ISCONNECTING )) {
- /* connect() has finished, check result */
-
- Conn_OPTION_DEL( &My_Connections[Idx], CONN_ISCONNECTING );
-
- /* Ergebnis des connect() ermitteln */
- 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[Conf_GetServer( Idx )].port, Idx, strerror( err ));
-
- /* 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[Conf_GetServer( Idx )].lasttry = time( NULL );
- Conf_UnsetServer( Idx );
-
- return false;
- }
- Log( LOG_INFO, "Connection %d with \"%s:%d\" established. Now logging in ...", Idx, My_Connections[Idx].host, Conf_Server[Conf_GetServer( Idx )].port );
-
- /* 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 );
+ 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 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 ));
+ 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;
} /* Handle_Write */
-LOCAL void
+static int
New_Connection( int Sock )
{
/* Neue Client-Verbindung von Listen-Socket annehmen und
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
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;
+ return -1;
}
#endif
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;
+ return -1;
}
/* Freie Connection-Struktur suchen */
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;
}
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;
+ return -1;
}
ptr = (POINTER *)realloc( My_Connections, sizeof( CONNECTION ) * new_size );
- if( ! ptr )
- {
+ if( ! ptr ) {
Log( LOG_EMERG, "Can't allocate memory! [New_Connection]" );
Simple_Message( new_sock, "ERROR: Internal error" );
close( new_sock );
- return;
+ return -1;
}
#ifdef DEBUG
/* Client-Struktur initialisieren */
c = Client_NewLocal( idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWN, false );
- if( ! c )
- {
+ 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 );
#else
s = Resolve_Addr( &new_addr );
#endif
- if( s )
- {
- /* Sub-Prozess wurde asyncron gestartet */
- My_Connections[idx].res_stat = s;
- }
+ /* 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
+static CONN_ID
Socket2Index( int Sock )
{
/* zum Socket passende Connection suchen */
} /* 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;
-#ifdef ZLIB
- CLIENT *c;
-#endif
+ 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 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 ))
+ 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, "Receive buffer overflow (connection %d): %d bytes!", Idx, My_Connections[Idx].rdatalen );
+ 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 ZLIB
- if ( Conn_OPTION_ISSET( &My_Connections[Idx], 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 (%s) is closing the connection ...", My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port), inet_ntoa( My_Connections[Idx].addr.sin_addr ));
+ 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 ));
+ 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 bool
+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;
#endif
#endif
result = false;
- do
- {
+ do {
/* Check penalty */
if( My_Connections[Idx].delaytime > time( NULL )) return result;
-
#ifdef ZLIB
- /* ggf. noch unkomprimiete Daten weiter entpacken */
+ /* 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;
+ if (0 == array_bytes(&My_Connections[Idx].rbuf))
+ 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 (!array_cat0_temporary(&My_Connections[Idx].rbuf)) /* make sure buf is NULL terminated */
+ return false;
- if( ptr ) delta = 2;
+ /* 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;
#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;
- }
+ if( ! ptr )
+ break;
+
+ /* End of request found */
+ *ptr = '\0';
+
+ len = ( ptr - (char*) array_start(&My_Connections[Idx].rbuf)) + delta;
+
+ 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
- /* merken, ob Stream bereits komprimiert wird */
- old_z = My_Connections[Idx].options & CONN_ZIP;
+ /* remember if stream is already compressed */
+ 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;
- }
+ 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;
- /* Puffer anpassen */
- My_Connections[Idx].rdatalen -= len;
- memmove( My_Connections[Idx].rbuf, My_Connections[Idx].rbuf + len, My_Connections[Idx].rdatalen );
+ 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
+ }
#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;
+ 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.", My_Connections[Idx].zip.rdatalen );
+ Log( LOG_DEBUG, "Moved already received data (%d bytes) to uncompression buffer.", array_bytes(&My_Connections[Idx].zip.rbuf));
#endif /* DEBUG */
- }
-#endif /* ZLIB */
}
-
+#endif /* ZLIB */
if( action ) result = true;
} while( action );
} /* Handle_Buffer */
-LOCAL 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;
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 );
}
}
- 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
}
else
{
- /* noch nicht vollstaendig aufgebaute Verbindung */
+ /* connection is not fully established yet */
if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout )
{
/* Timeout */
} /* Check_Connections */
-LOCAL void
+static void
Check_Servers( void )
{
/* Check if we can establish further server links */
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
+static void
New_Server( int Server, CONN_ID Idx )
{
/* Establish new server link */
assert( Idx > NONE );
/* Did we get a valid IP address? */
- if( ! Conf_Server[Server].ip[0] )
- {
+ if( ! Conf_Server[Server].ip[0] ) {
/* 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;
+ 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 );
#endif
{
/* 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;
+ 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 )
- {
+ 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;
+ 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 );
- Conf_Server[Server].conn_id = NONE;
- return;
+ goto out;
}
/* Client-Struktur initialisieren */
c = Client_NewLocal( Idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWNSERVER, false );
- if( ! c )
- {
+ 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;
+ close( new_sock );
+ goto out;
}
+
Client_SetIntroducer( c, c );
Client_SetToken( c, TOKEN_OUTBOUND );
strlcpy( My_Connections[Idx].host, Conf_Server[Server].host, sizeof( My_Connections[Idx].host ));
/* Register new socket */
- FD_SET( new_sock, &My_Sockets );
- Conn_OPTION_ADD( &My_Connections[Idx], CONN_ISCONNECTING );
-
- if( new_sock > Conn_MaxFD ) Conn_MaxFD = new_sock;
+ 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
+static void
Init_Conn_Struct( CONN_ID Idx )
{
time_t now = time( NULL );
memset( &My_Connections[Idx], 0, sizeof ( CONNECTION ));
My_Connections[Idx].sock = NONE;
- My_Connections[Idx].starttime = now;
My_Connections[Idx].lastdata = now;
My_Connections[Idx].lastprivmsg = now;
} /* Init_Conn_Struct */
-LOCAL bool
+static bool
Init_Socket( int Sock )
{
/* Initialize socket (set options) */
int value;
-#ifdef O_NONBLOCK /* unknown on A/UX */
- if( fcntl( Sock, F_SETFL, O_NONBLOCK ) != 0 )
- {
+ if (!io_setnonblock(Sock)) {
Log( LOG_CRIT, "Can't enable non-blocking mode for socket: %s!", strerror( errno ));
close( Sock );
return false;
}
-#endif
/* Don't block this port after socket shutdown */
value = 1;
} /* Init_Socket */
-LOCAL void
-Read_Resolver_Result( int r_fd )
+GLOBAL
+void Read_Resolver_Result( int r_fd )
{
/* 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;
+ int bytes_read, i, n;
+ unsigned int len;
RES_STAT *s;
char *ptr;
+ char *bufptr;
+ char readbuf[HOST_LEN];
+ Log( LOG_DEBUG, "Resolver: started, fd %d", r_fd );
/* Search associated connection ... */
for( i = 0; i < Pool_Size; i++ )
{
{
/* Ops, none found? Probably the connection has already
* been closed!? We'll ignore that ... */
- FD_CLR( r_fd, &Resolver_FDs );
- close( r_fd );
+ io_close( r_fd );
#ifdef DEBUG
Log( LOG_DEBUG, "Resolver: Got result for unknown connection!?" );
#endif
assert( s != NULL );
/* Read result from pipe */
- len = read( r_fd, s->buffer + s->bufpos, sizeof( s->buffer ) - s->bufpos - 1 );
- if( len < 0 )
- {
+ bytes_read = read( r_fd, readbuf, sizeof readbuf -1 );
+ if( bytes_read < 0 ) {
/* Error! */
- close( r_fd );
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;
}
- s->bufpos += len;
- s->buffer[s->bufpos] = '\0';
/* If the result string is incomplete, return to main loop and
* wait until we can read in more bytes. */
#ifdef IDENTAUTH
try_resolve:
#endif
- ptr = strchr( s->buffer, '\n' );
+ 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\" (%d bytes), stage %d.", s->buffer, len, s->stage );
+ 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 conneciions.*/
+ * incoming connections.*/
if( My_Connections[i].sock > NONE )
{
- /* Incoming connection */
-
- /* Search client ... */
+ /* Incoming connection. Search client ... */
c = Client_GetFromConn( i );
assert( c != NULL );
/* 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 );
+ 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( s->buffer ) + 1;
- memmove( s->buffer, s->buffer + len, sizeof( s->buffer ) - len );
- s->bufpos -= len;
+ 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;
- }
- 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 );
+
+ 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 );
}
- 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 );
n = Conf_GetServer( i );
assert( n > NONE );
- strlcpy( Conf_Server[n].ip, s->buffer, sizeof( Conf_Server[n].ip ));
+ bufptr = (char*) array_start(&s->buffer);
+ strlcpy( Conf_Server[n].ip, bufptr, sizeof( Conf_Server[n].ip ));
}
/* 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;
+ FreeRes_stat( &My_Connections[i] );
/* Reset penalty time */
Conn_ResetPenalty( i );
} /* Read_Resolver_Result */
-LOCAL void
+static void
Simple_Message( int Sock, char *Msg )
{
+ 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 );
- (void)send( Sock, Msg, strlen( Msg ), 0 );
- (void)send( Sock, "\r\n", 2, 0 );
+ strlcpy( buf, Msg, sizeof buf - 2);
+ strlcat( buf, "\r\n", sizeof buf);
+ (void)write( Sock, buf, strlen( buf ) );
} /* Simple_Error */
-LOCAL int
+static int
Count_Connections( struct sockaddr_in addr_in )
{
int i, cnt;
} /* Count_Connections */
+
/* -eof- */
projects / ngircd-alex.git / blobdiff