/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2004 Alexander Barton <alex@barton.de>
+ * Copyright (c)2001-2007 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"
-
-static char UNUSED id[] = "$Id: conn.c,v 1.143 2005/01/19 23:33:54 alex Exp $";
+#include "conf-ssl.h"
+#include "io.h"
#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 <netinet/ip.h>
#endif
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#else
-# define PF_INET AF_INET
-#endif
-
#ifdef HAVE_STDINT_H
# include <stdint.h> /* e.g. for Mac OS X */
#endif
# include <tcpd.h> /* for TCP Wrappers */
#endif
+#include "array.h"
#include "defines.h"
#include "resolve.h"
#include "ngircd.h"
#include "client.h"
#include "conf.h"
+#include "conn-ssl.h"
#include "conn-zip.h"
#include "conn-func.h"
#include "log.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 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(( CONN_ID 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 ));
-LOCAL VOID Simple_Message PARAMS(( INT Sock, CHAR *Msg ));
-LOCAL INT Count_Connections PARAMS(( struct sockaddr_in addr ));
-
-LOCAL fd_set My_Listeners;
-LOCAL fd_set My_Sockets;
-LOCAL fd_set My_Connects;
+static bool Handle_Write PARAMS(( CONN_ID Idx ));
+static bool Conn_Write PARAMS(( CONN_ID Idx, char *Data, size_t Len ));
+static int New_Connection PARAMS(( int Sock ));
+static CONN_ID Socket2Index PARAMS(( int Sock ));
+static void Read_Request PARAMS(( CONN_ID Idx ));
+static void 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, ng_ipaddr_t *dest ));
+static void Simple_Message PARAMS(( int Sock, const char *Msg ));
+static int NewListener PARAMS(( const char *listen_addr, UINT16 Port ));
+
+static array My_Listeners;
+static array My_ConnArray;
+static size_t NumConnections;
#ifdef TCPWRAP
-INT allow_severity = LOG_INFO;
-INT deny_severity = LOG_ERR;
+int allow_severity = LOG_INFO;
+int deny_severity = LOG_ERR;
+#endif
+
+static void server_login PARAMS((CONN_ID idx));
+
+#ifdef SSL_SUPPORT
+extern struct SSLOptions Conf_SSLOptions;
+static void cb_connserver_login_ssl PARAMS((int sock, short what));
+static void cb_clientserver_ssl PARAMS((int sock, short what));
+#endif
+static void cb_Read_Resolver_Result PARAMS(( int sock, UNUSED short what));
+static void cb_Connect_to_Server PARAMS(( int sock, UNUSED short what));
+static void cb_clientserver PARAMS((int sock, short what));
+
+static void
+cb_listen(int sock, short irrelevant)
+{
+ (void) irrelevant;
+ if (New_Connection( sock ) >= 0)
+ NumConnections++;
+ LogDebug("Total number of connections now %ld.", NumConnections);
+}
+
+
+#ifdef SSL_SUPPORT
+static void
+cb_listen_ssl(int sock, short irrelevant)
+{
+ int fd;
+ (void) irrelevant;
+ fd = New_Connection(sock);
+ if (fd < 0)
+ return;
+
+ NumConnections++;
+ LogDebug("Total number of connections now %ld.", NumConnections);
+ io_event_setcb(My_Connections[fd].sock, cb_clientserver_ssl);
+}
+#endif
+
+
+static void
+cb_connserver(int sock, UNUSED short what)
+{
+ int res, err;
+ socklen_t sock_len;
+ CONN_ID idx = Socket2Index( sock );
+ if (idx <= NONE) {
+ LogDebug("cb_connserver wants to write on unknown socket?!");
+ 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 ));
+
+ /* Error while connecting? */
+ 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));
+
+ res = Conf_GetServer(idx);
+ assert(res >= 0);
+
+ Conn_Close(idx, "Can't connect!", NULL, false);
+
+ if (res < 0)
+ return;
+ if (ng_ipaddr_af(&Conf_Server[res].dst_addr[0])) {
+ /* more addresses to try... */
+ New_Server(res, &Conf_Server[res].dst_addr[0]);
+ /* connection to dst_addr[0] in progress, remove this address... */
+ Conf_Server[res].dst_addr[0] = Conf_Server[res].dst_addr[1];
+
+ memset(&Conf_Server[res].dst_addr[1], 0, sizeof(&Conf_Server[res].dst_addr[1]));
+ }
+ return;
+ }
+
+ res = Conf_GetServer(idx);
+ assert(res >= 0);
+ if (res >= 0) /* connect succeeded, remove all additional addresses */
+ memset(&Conf_Server[res].dst_addr, 0, sizeof(&Conf_Server[res].dst_addr));
+ Conn_OPTION_DEL( &My_Connections[idx], CONN_ISCONNECTING );
+#ifdef SSL_SUPPORT
+ if ( Conn_OPTION_ISSET( &My_Connections[idx], CONN_SSL_CONNECT )) {
+ io_event_setcb( sock, cb_connserver_login_ssl );
+ io_event_add( sock, IO_WANTWRITE|IO_WANTREAD );
+ return;
+ }
+#endif
+ 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 );
+}
+
+
+#ifdef SSL_SUPPORT
+static void
+cb_connserver_login_ssl(int sock, short unused)
+{
+ CONN_ID idx = Socket2Index(sock);
+
+ assert(idx >= 0);
+ if (idx < 0) {
+ io_close(sock);
+ return;
+ }
+ (void) unused;
+ switch (ConnSSL_Connect( &My_Connections[idx])) {
+ case 1: break;
+ case 0: LogDebug("ConnSSL_Connect: not ready");
+ return;
+ case -1:
+ Log(LOG_INFO, "SSL connection on socket %d failed", sock);
+ Conn_Close(idx, "Can't connect!", NULL, false);
+ return;
+ }
+
+ Log( LOG_INFO, "SSL Connection %d with \"%s:%d\" established.", idx,
+ My_Connections[idx].host, Conf_Server[Conf_GetServer( idx )].port );
+
+ server_login(idx);
+}
+#endif
+
+
+static void
+cb_clientserver(int sock, short what)
+{
+ CONN_ID idx = Socket2Index(sock);
+
+ assert(idx >= 0);
+
+ if (idx < 0) {
+ io_close(sock);
+ return;
+ }
+#ifdef SSL_SUPPORT
+ if (what & IO_WANTREAD || (Conn_OPTION_ISSET(&My_Connections[idx], CONN_SSL_WANT_WRITE)))
+ Read_Request( idx ); /* if TLS layer needs to write additional data, call Read_Request instead so SSL/TLS can continue */
+#else
+ if (what & IO_WANTREAD)
+ Read_Request( idx );
+#endif
+ if (what & IO_WANTWRITE)
+ Handle_Write( idx );
+}
+
+
+#ifdef SSL_SUPPORT
+static void
+cb_clientserver_ssl(int sock, short what)
+{
+ CONN_ID idx = Socket2Index(sock);
+
+ assert(idx >= 0);
+
+ if (idx < 0) {
+ io_close(sock);
+ return;
+ }
+
+ switch (ConnSSL_Accept(&My_Connections[idx])) {
+ case 1: break; /* OK */
+ case 0: return; /* EAGAIN: this callback will be invoked again by the io layer */
+ default:
+ Conn_Close( idx, "Socket closed!", "SSL accept error", false );
+ return;
+ }
+ if (what & IO_WANTREAD)
+ Read_Request(idx);
+
+ if (what & IO_WANTWRITE)
+ Handle_Write(idx);
+
+ io_event_setcb(sock, cb_clientserver); /* SSL handshake completed */
+}
#endif
-GLOBAL VOID
-Conn_Init( VOID )
+GLOBAL void
+Conn_Init( void )
{
/* Modul initialisieren: statische Strukturen "ausnullen". */
/* Speicher fuer Verbindungs-Pool anfordern */
Pool_Size = CONNECTION_POOL;
- if( Conf_MaxConnections > 0 )
- {
- /* konfiguriertes Limit beachten */
- if( Pool_Size > Conf_MaxConnections ) Pool_Size = Conf_MaxConnections;
- }
- My_Connections = (CONNECTION *)malloc( sizeof( CONNECTION ) * Pool_Size );
- if( ! My_Connections )
- {
- /* Speicher konnte nicht alloziert werden! */
+ if ((Conf_MaxConnections > 0) &&
+ (Pool_Size > Conf_MaxConnections))
+ Pool_Size = Conf_MaxConnections;
+
+ if (!array_alloc(&My_ConnArray, sizeof(CONNECTION), (size_t)Pool_Size)) {
Log( LOG_EMERG, "Can't allocate memory! [Conn_Init]" );
exit( 1 );
}
-#ifdef DEBUG
- Log( LOG_DEBUG, "Allocated connection pool for %d items (%ld bytes).", Pool_Size, sizeof( CONNECTION ) * Pool_Size );
-#endif
- /* zu Beginn haben wir keine Verbindungen */
- FD_ZERO( &My_Listeners );
- FD_ZERO( &My_Sockets );
- FD_ZERO( &My_Connects );
+ /* FIXME: My_Connetions/Pool_Size is needed by other parts of the
+ * code; remove them! */
+ My_Connections = (CONNECTION*) array_start(&My_ConnArray);
+
+ LogDebug("Allocated connection pool for %d items (%ld bytes).",
+ array_length(&My_ConnArray, sizeof( CONNECTION )), array_bytes(&My_ConnArray));
- /* Groesster File-Descriptor fuer select() */
- Conn_MaxFD = 0;
+ assert( array_length(&My_ConnArray, sizeof( CONNECTION )) >= (size_t) Pool_Size);
+
+ array_free( &My_Listeners );
/* Connection-Struktur initialisieren */
for( i = 0; i < Pool_Size; i++ ) Init_Conn_Struct( i );
} /* 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;
-#ifdef DEBUG
- Log( LOG_DEBUG, "Shutting down all connections ..." );
-#endif
+ LogDebug("Shutting down all connections ..." );
-#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( FD_ISSET( i, &My_Connects ))
- {
- close( i );
-#ifdef DEBUG
- Log( LOG_DEBUG, "Connection %d closed during creation (socket %d).", idx, i );
-#endif
- }
- else if( idx < Pool_Size )
- {
- if( NGIRCd_SignalRestart ) Conn_Close( idx, NULL, "Server going down (restarting)", TRUE );
- else Conn_Close( idx, NULL, "Server going down", TRUE );
- }
- else
- {
- 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 );
}
}
- free( My_Connections );
+ array_free(&My_ConnArray);
My_Connections = NULL;
Pool_Size = 0;
+ io_library_shutdown();
} /* Conn_Exit */
-GLOBAL INT
-Conn_InitListeners( VOID )
+static unsigned int
+ports_initlisteners(array *a, const char *listen_addr, void (*func)(int,short))
+{
+ unsigned int created = 0;
+ size_t len;
+ int fd;
+ UINT16 *port;
+
+ len = array_length(a, sizeof (UINT16));
+ port = array_start(a);
+ while (len--) {
+ fd = NewListener(listen_addr, *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 unsigned int
+Conn_InitListeners( void )
{
/* Initialize ports on which the server should accept connections */
+ unsigned int created = 0;
+ char *copy, *listen_addr;
+
+ if (!io_library_init(CONNECTION_POOL)) {
+ Log(LOG_EMERG, "Cannot initialize IO routines: %s", strerror(errno));
+ return -1;
+ }
- INT created, i;
+ assert(Conf_ListenAddress);
- 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] );
+ /* can't use Conf_ListenAddress directly, see below */
+ copy = strdup(Conf_ListenAddress);
+ if (!copy) {
+ Log(LOG_CRIT, "Cannot copy %s: %s", Conf_ListenAddress, strerror(errno));
+ return 0;
+ }
+ listen_addr = strtok(copy, ",");
+
+ while (listen_addr) {
+ ngt_TrimStr(listen_addr);
+ if (*listen_addr) {
+ created += ports_initlisteners(&Conf_ListenPorts, listen_addr, cb_listen);
+#ifdef SSL_SUPPORT
+ created += ports_initlisteners(&Conf_SSLOptions.ListenPorts, listen_addr, cb_listen_ssl);
+#endif
+ }
+
+ listen_addr = strtok(NULL, ",");
}
+
+ /*
+ * can't free() Conf_ListenAddress here. On /REHASH, if the config file
+ * cannot be re-loaded, we'd end up with a NULL Conf_ListenAddress.
+ * Instead, free() takes place in conf.c, before the config file
+ * is being parsed.
+ */
+ free(copy);
return created;
} /* Conn_InitListeners */
-GLOBAL VOID
-Conn_ExitListeners( VOID )
+GLOBAL void
+Conn_ExitListeners( void )
{
/* Close down all listening sockets */
-
- INT i;
-
-#ifdef RENDEZVOUS
+ int *fd;
+ size_t 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 );
-#ifdef DEBUG
- Log( LOG_DEBUG, "Listening socket %d closed.", i );
-#endif
- }
+ arraylen = array_length(&My_Listeners, sizeof (int));
+ Log( LOG_INFO, "Shutting down all listening sockets (%d total)...", arraylen );
+ fd = array_start(&My_Listeners);
+ while(arraylen--) {
+ assert(fd != NULL);
+ assert(*fd >= 0);
+ io_close(*fd);
+ LogDebug("Listening socket %d closed.", *fd );
+ fd++;
}
+ array_free(&My_Listeners);
} /* Conn_ExitListeners */
-GLOBAL BOOLEAN
-Conn_NewListener( CONST UINT Port )
+static bool
+InitSinaddrListenAddr(ng_ipaddr_t *addr, const char *listen_addrstr, UINT16 Port)
{
- /* Create new listening socket on specified port */
+ bool ret;
- struct sockaddr_in addr;
- struct in_addr inaddr;
- INT sock;
-#ifdef RENDEZVOUS
- CHAR name[CLIENT_ID_LEN], *info;
-#endif
+ ret = ng_ipaddr_init(addr, listen_addrstr, Port);
+ if (!ret) {
+ assert(listen_addrstr);
+ Log(LOG_CRIT, "Can't bind to [%s]:%u: can't convert ip address \"%s\"",
+ listen_addrstr, Port, listen_addrstr);
+ }
+ return ret;
+}
- /* Server-"Listen"-Socket initialisieren */
- memset( &addr, 0, sizeof( addr ));
- memset( &inaddr, 0, sizeof( inaddr ));
- addr.sin_family = AF_INET;
- addr.sin_port = htons( Port );
- if( Conf_ListenAddress[0] )
- {
-#ifdef HAVE_INET_ATON
- if( inet_aton( Conf_ListenAddress, &inaddr ) == 0 )
+
+static void
+set_v6_only(int af, int sock)
+{
+#if defined(IPV6_V6ONLY) && defined(WANT_IPV6)
+ int on = 1;
+
+ if (af != AF_INET6)
+ return;
+
+ if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)))
+ Log(LOG_ERR, "Could not set IPV6_V6ONLY: %s", strerror(errno));
#else
- inaddr.s_addr = inet_addr( Conf_ListenAddress );
- if( inaddr.s_addr == (unsigned)-1 )
+ (void)af;
+ (void)sock;
#endif
- {
- Log( LOG_CRIT, "Can't listen on %s:%u: can't convert ip address %s!", Conf_ListenAddress, Port, Conf_ListenAddress );
- return FALSE;
- }
- }
- else inaddr.s_addr = htonl( INADDR_ANY );
- addr.sin_addr = inaddr;
+}
- /* Socket erzeugen */
- sock = socket( PF_INET, SOCK_STREAM, 0);
- if( sock < 0 )
- {
- Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
- return FALSE;
+
+/* return new listening port file descriptor or -1 on failure */
+static int
+NewListener(const char *listen_addr, UINT16 Port)
+{
+ /* Create new listening socket on specified port */
+ ng_ipaddr_t addr;
+ int sock, af;
+#ifdef ZEROCONF
+ char name[CLIENT_ID_LEN], *info;
+#endif
+ if (!InitSinaddrListenAddr(&addr, listen_addr, Port))
+ return -1;
+
+ af = ng_ipaddr_af(&addr);
+ sock = socket(af, SOCK_STREAM, 0);
+ if( sock < 0 ) {
+ Log(LOG_CRIT, "Can't create socket (af %d) : %s!", af, strerror(errno));
+ return -1;
}
- if( ! Init_Socket( sock )) return FALSE;
+ set_v6_only(af, sock);
- /* 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;
+ if (!Init_Socket(sock))
+ return -1;
+
+ if (bind(sock, (struct sockaddr *)&addr, ng_ipaddr_salen(&addr)) != 0) {
+ Log(LOG_CRIT, "Can't bind socket to address %s:%d - %s",
+ ng_ipaddr_tostr(&addr), Port, strerror(errno));
+ close(sock);
+ return -1;
}
- /* in "listen mode" gehen :-) */
- if( listen( sock, 10 ) != 0 )
- {
- Log( LOG_CRIT, "Can't listen on soecket: %s!", strerror( errno ));
+ if( listen( sock, 10 ) != 0 ) {
+ Log( LOG_CRIT, "Can't listen on socket: %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;
+ /* keep fd in list so we can close it when ngircd restarts/shuts down */
+ 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 );
+ Log(LOG_INFO, "Now listening on [%s]:%d (socket %d).", ng_ipaddr_tostr(&addr), Port, sock);
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
/* Get best server description text */
if( ! Conf_ServerInfo[0] ) info = Conf_ServerName;
else
}
/* 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 ));
+ if (Port != 6667)
+ snprintf(name, sizeof name, "%s (port %u)", info,
+ (unsigned int)Port);
+ else
+ strlcpy(name, info, sizeof name);
/* Register service */
- Rendezvous_Register( name, RENDEZVOUS_TYPE, Port );
+ Rendezvous_Register( name, MDNS_TYPE, Port );
#endif
+ return sock;
+} /* NewListener */
- return TRUE;
-} /* Conn_NewListener */
+#ifdef SSL_SUPPORT
+/*
+ * SSL/TLS connections require extra treatment:
+ * When either CONN_SSL_WANT_WRITE or CONN_SSL_WANT_READ is set, we
+ * need to take care of that first, before checking read/write buffers.
+ * For instance, while we might have data in our write buffer, the
+ * TLS/SSL protocol might need to read internal data first for TLS/SSL
+ * writes to succeed.
+ *
+ * If this function returns true, such a condition is met and we have
+ * to reverse the condition (check for read even if we've data to write,
+ * do not check for read but writeability even if write-buffer is empty).
+ */
+static bool
+SSL_WantRead(const CONNECTION *c)
+{
+ if (Conn_OPTION_ISSET(c, CONN_SSL_WANT_READ)) {
+ io_event_add(c->sock, IO_WANTREAD);
+ return true;
+ }
+ return false;
+}
+static bool
+SSL_WantWrite(const CONNECTION *c)
+{
+ if (Conn_OPTION_ISSET(c, CONN_SSL_WANT_WRITE)) {
+ io_event_add(c->sock, IO_WANTWRITE);
+ return true;
+ }
+ return false;
+}
+#else
+static inline bool
+SSL_WantRead(UNUSED const CONNECTION *c) { return false; }
+static inline bool
+SSL_WantWrite(UNUSED const CONNECTION *c) { return false; }
+#endif
-GLOBAL VOID
-Conn_Handler( VOID )
+/**
+ * "Main Loop": Loop until shutdown or restart is signalled.
+ * This function loops until a shutdown or restart of ngIRCd is signalled and
+ * calls io_dispatch() to check for readable and writable sockets every second.
+ * It checks for status changes on pending connections (e. g. when a hostname
+ * has been resolved), checks for "penalties" and timeouts, and handles the
+ * input buffers.
+ */
+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.
- */
-
- fd_set read_sockets, write_sockets;
+ int i;
+ unsigned int wdatalen;
struct timeval tv;
- time_t start, t;
- CONN_ID i, idx;
- BOOLEAN timeout;
+ time_t t;
- start = time( NULL );
- while(( ! NGIRCd_SignalQuit ) && ( ! NGIRCd_SignalRestart ))
- {
- timeout = TRUE;
+ while (!NGIRCd_SignalQuit && !NGIRCd_SignalRestart) {
+ t = time(NULL);
-#ifdef RENDEZVOUS
- Rendezvous_Handler( );
+#ifdef ZEROCONF
+ Rendezvous_Handler();
#endif
/* Should the configuration be reloaded? */
- if( NGIRCd_SignalRehash ) NGIRCd_Rehash( );
+ 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 ) &&
- ( My_Connections[i].delaytime < t ))
- {
- /* Kann aus dem Buffer noch ein Befehl extrahiert werden? */
- if( Handle_Buffer( i )) timeout = FALSE;
+ Check_Servers();
+ Check_Connections();
+
+ /* Look for non-empty read buffers ... */
+ for (i = 0; i < Pool_Size; i++) {
+ if ((My_Connections[i].sock > NONE)
+ && (array_bytes(&My_Connections[i].rbuf) > 0)
+ && (My_Connections[i].delaytime < t)) {
+ /* ... and try to handle the received data */
+ Handle_Buffer(i);
}
}
- /* noch volle Schreib-Puffer suchen */
- FD_ZERO( &write_sockets );
- for( i = 0; i < Pool_Size; i++ )
- {
+ /* Look for non-empty write buffers ... */
+ for (i = 0; i < Pool_Size; i++) {
+ if (My_Connections[i].sock <= NONE)
+ continue;
+
+ wdatalen = (unsigned int)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 );
- }
- }
-
- /* 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? */
- 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 );
- }
- 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 )
- {
- /* 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 );
+ if (SSL_WantRead(&My_Connections[i]))
+ continue;
+ io_event_add(My_Connections[i].sock,
+ IO_WANTWRITE);
}
}
- /* Timeout initialisieren */
- tv.tv_usec = 0;
- 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_NAME );
- exit( 1 );
+ /* Check from which sockets we possibly could read ... */
+ for (i = 0; i < Pool_Size; i++) {
+ if (My_Connections[i].sock <= NONE)
+ continue;
+#ifdef SSL_SUPPORT
+ if (SSL_WantWrite(&My_Connections[i]))
+ continue; /* TLS/SSL layer needs to write data; deal with this first */
+#endif
+ if (Resolve_INPROGRESS(&My_Connections[i].res_stat)) {
+ /* Wait for completion of resolver sub-process ... */
+ io_event_del(My_Connections[i].sock,
+ IO_WANTREAD);
+ continue;
}
- 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 (Conn_OPTION_ISSET(&My_Connections[i], CONN_ISCONNECTING))
+ /* Wait for completion of connect() ... */
+ continue;
- if( ! Handle_Write( idx ))
- {
- /* Fehler beim Schreiben! Diesen Socket nun
- * auch aus dem Read-Set entfernen: */
- FD_CLR( i, &read_sockets );
+ if (My_Connections[i].delaytime > t) {
+ /* There is a "penalty time" set: ignore socket! */
+ io_event_del(My_Connections[i].sock,
+ IO_WANTREAD);
+ continue;
}
+ io_event_add(My_Connections[i].sock, IO_WANTREAD);
}
- /* Daten zum Lesen vorhanden? */
- for( i = 0; i < Conn_MaxFD + 1; i++ )
- {
- if( FD_ISSET( i, &read_sockets )) Handle_Read( i );
+ /* Set the timeout for reading from the network to 1 second,
+ * which is the granularity with witch we handle "penalty
+ * times" for example.
+ * Note: tv_sec/usec are undefined(!) after io_dispatch()
+ * returns, so we have to set it beforce each call to it! */
+ tv.tv_usec = 0;
+ tv.tv_sec = 1;
+
+ /* Wait for activity ... */
+ 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!" );
+ 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];
+ size_t 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
- strlcat( buffer, "\r\n", sizeof( buffer ));
- ok = Conn_Write( Idx, buffer, strlen( buffer ));
+ len = strlcat( buffer, "\r\n", sizeof( buffer ));
+ ok = Conn_Write(Idx, buffer, len);
My_Connections[Idx].msg_out++;
va_end( ap );
} /* Conn_WriteStr */
-GLOBAL BOOLEAN
-Conn_Write( CONN_ID Idx, CHAR *Data, INT Len )
+/**
+ * Append Data to the outbound write buffer of a connection.
+ * @param Idx Index of the connection.
+ * @param Data pointer to the data.
+ * @param Len length of Data.
+ * @return true on success, false otherwise.
+ */
+static bool
+Conn_Write( CONN_ID Idx, char *Data, size_t Len )
{
- /* Daten in Socket schreiben. Bei "fatalen" Fehlern wird
- * der Client disconnectiert und FALSE geliefert. */
-
+ CLIENT *c;
+ size_t writebuf_limit = WRITEBUFFER_LEN;
assert( Idx > NONE );
assert( Data != NULL );
assert( Len > 0 );
- /* Ist der entsprechende Socket ueberhaupt noch offen? In einem
- * "Handler-Durchlauf" kann es passieren, dass dem nicht mehr so
- * ist, wenn einer von mehreren Conn_Write()'s fehlgeschlagen ist.
- * In diesem Fall wird hier einfach ein Fehler geliefert. */
- if( My_Connections[Idx].sock <= NONE )
- {
-#ifdef DEBUG
- Log( LOG_DEBUG, "Skipped write on closed socket (connection %d).", Idx );
-#endif
- return FALSE;
- }
+ c = Conn_GetClient(Idx);
+ assert( c != NULL);
- /* Pruefen, ob im Schreibpuffer genuegend Platz ist. Ziel ist es,
- * moeglichts viel im Puffer zu haben und _nicht_ gleich alles auf den
- * Socket zu schreiben (u.a. wg. Komprimierung). */
- if( WRITEBUFFER_LEN - My_Connections[Idx].wdatalen - Len <= 0 )
- {
- /* Der Puffer ist dummerweise voll. Jetzt versuchen, den Puffer
- * zu schreiben, wenn das nicht klappt, haben wir ein Problem ... */
- if( ! Try_Write( Idx )) return FALSE;
+ /* Servers do get special write buffer limits, so they can generate
+ * all the messages that are required while peering. */
+ if (Client_Type(c) == CLIENT_SERVER)
+ writebuf_limit = WRITEBUFFER_SLINK_LEN;
- /* nun neu pruefen: */
- if( WRITEBUFFER_LEN - My_Connections[Idx].wdatalen - Len <= 0 )
- {
- Log( LOG_NOTICE, "Write buffer overflow (connection %d)!", Idx );
- Conn_Close( Idx, "Write buffer overflow!", NULL, FALSE );
- return FALSE;
- }
+ /* Is the socket still open? A previous call to Conn_Write()
+ * may have closed the connection due to a fatal error.
+ * In this case it is sufficient to return an error, as well. */
+ if( My_Connections[Idx].sock <= NONE ) {
+ LogDebug("Skipped write on closed socket (connection %d).", Idx);
+ return false;
}
#ifdef ZLIB
- if( My_Connections[Idx].options & CONN_ZIP )
- {
- /* Daten komprimieren und in Puffer kopieren */
- if( ! Zip_Buffer( Idx, Data, Len )) return FALSE;
+ if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) {
+ /* Compressed link:
+ * Zip_Buffer() does all the dirty work for us: it flushes
+ * the (pre-)compression buffers if required and handles
+ * all error conditions. */
+ 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;
+ /* Uncompressed link:
+ * Check if outbound buffer has enough space for the data. */
+ if (array_bytes(&My_Connections[Idx].wbuf) + Len >=
+ writebuf_limit) {
+ /* Buffer is full, flush it. Handle_Write deals with
+ * low-level errors, if any. */
+ if (!Handle_Write(Idx))
+ return false;
+ }
+
+ /* When the write buffer is still too big after flushing it,
+ * the connection will be killed. */
+ if (array_bytes(&My_Connections[Idx].wbuf) + Len >=
+ writebuf_limit) {
+ Log(LOG_NOTICE,
+ "Write buffer overflow (connection %d, size %lu byte)!",
+ Idx,
+ (unsigned long)array_bytes(&My_Connections[Idx].wbuf));
+ Conn_Close(Idx, "Write buffer overflow!", NULL, false);
+ return false;
+ }
+
+ /* Copy data to write buffer */
+ if (!array_catb(&My_Connections[Idx].wbuf, Data, Len))
+ return false;
+
My_Connections[Idx].bytes_out += Len;
}
/* Adjust global write counter */
WCounter += Len;
- return TRUE;
+ 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 )
{
/* Close connection. Open pipes of asyncronous resolver
* sub-processes are closed down. */
CLIENT *c;
- CHAR *txt;
- DOUBLE in_k, out_k;
+ char *txt;
+ double in_k, out_k;
+ UINT16 port;
#ifdef ZLIB
- DOUBLE in_z_k, out_z_k;
- INT in_p, out_p;
+ double in_z_k, out_z_k;
+ int in_p, out_p;
#endif
assert( Idx > NONE );
/* Is this link already shutting down? */
- if( My_Connections[Idx].options & CONN_ISCLOSING )
- {
+ 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. */
-#ifdef DEBUG
- Log( LOG_DEBUG, "Recursive request to close connection: %d", Idx );
-#endif
+ * probabe reason: Handle_Write() failed -- see below. */
+ LogDebug("Recursive request to close connection: %d", Idx );
return;
}
assert( My_Connections[Idx].sock > NONE );
/* Mark link as "closing" */
- My_Connections[Idx].options |= CONN_ISCLOSING;
-
- if( LogMsg ) txt = LogMsg;
- else txt = FwdMsg;
- if( ! txt ) txt = "Reason unknown";
+ Conn_OPTION_ADD( &My_Connections[Idx], CONN_ISCLOSING );
+
+ if (LogMsg)
+ txt = LogMsg;
+ else
+ txt = FwdMsg;
+ if (! txt)
+ txt = "Reason unknown";
- Log( LOG_INFO, "Shutting down connection %d (%s) with %s:%d ...", Idx, LogMsg ? LogMsg : FwdMsg, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port ));
+ port = ng_ipaddr_getport(&My_Connections[Idx].addr);
+ Log(LOG_INFO, "Shutting down connection %d (%s) with %s:%d ...", Idx,
+ LogMsg ? LogMsg : FwdMsg, My_Connections[Idx].host, port);
/* Search client, if any */
- c = Client_GetFromConn( Idx );
+ c = Conn_GetClient( 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,
+ ":%s NOTICE %s :%sConnection statistics: client %.1f kb, server %.1f kb.",
+ Client_ID(Client_ThisServer()), Client_ID(c),
+ 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 );
-
+ /* Try to write out the write buffer. Note: Handle_Write() eventually
+ * removes the CLIENT structure associated with this connection if an
+ * error occurs! So we have to re-check if there is still an valid
+ * CLIENT structure after calling Handle_Write() ...*/
+ (void)Handle_Write( Idx );
+
+ /* Search client, if any (re-check!) */
+ c = Conn_GetClient( Idx );
+#ifdef SSL_SUPPORT
+ if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_SSL )) {
+ Log( LOG_INFO, "SSL Connection %d shutting down", Idx );
+ ConnSSL_Free(&My_Connections[Idx]);
+ }
+#endif
/* Shut down socket */
- if( close( My_Connections[Idx].sock ) != 0 )
- {
- /* Oops, we can't close the socket!? This is fatal! */
- Log( LOG_EMERG, "Error closing connection %d (socket %d) with %s:%d - %s!", Idx, My_Connections[Idx].sock, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port), strerror( errno ));
- Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
- exit( 1 );
+ 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,
+ port, strerror(errno));
}
/* Mark socket as invalid: */
- FD_CLR( My_Connections[Idx].sock, &My_Sockets );
- FD_CLR( My_Connections[Idx].sock, &My_Connects );
My_Connections[Idx].sock = NONE;
/* If there is still a client, unregister it now */
- if( c ) Client_Destroy( c, LogMsg, FwdMsg, TRUE );
+ 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;
+ in_k = (double)My_Connections[Idx].bytes_in / 1024;
+ out_k = (double)My_Connections[Idx].bytes_out / 1024;
#ifdef ZLIB
- if( My_Connections[Idx].options & CONN_ZIP )
- {
- in_z_k = (DOUBLE)My_Connections[Idx].zip.bytes_in / 1024;
- out_z_k = (DOUBLE)My_Connections[Idx].zip.bytes_out / 1024;
- in_p = (INT)(( in_k * 100 ) / in_z_k );
- out_p = (INT)(( out_k * 100 ) / out_z_k );
- Log( LOG_INFO, "Connection %d with %s:%d closed (in: %.1fk/%.1fk/%d%%, out: %.1fk/%.1fk/%d%%).", Idx, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port ), in_k, in_z_k, in_p, out_k, out_z_k, out_p );
+ 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;
+ /* Make sure that no division by zero can occur during
+ * the calculation of in_p and out_p: in_z_k and out_z_k
+ * are non-zero, that's guaranteed by the protocol until
+ * compression can be enabled. */
+ if (! in_z_k)
+ in_z_k = in_k;
+ if (! out_z_k)
+ out_z_k = out_k;
+ 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, port,
+ in_k, in_z_k, in_p, out_k, out_z_k, out_p);
}
else
#endif
{
- Log( LOG_INFO, "Connection %d with %s:%d closed (in: %.1fk, out: %.1fk).", Idx, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port ), in_k, out_k );
+ Log(LOG_INFO,
+ "Connection %d with %s:%d closed (in: %.1fk, out: %.1fk).",
+ Idx, My_Connections[Idx].host, port,
+ in_k, out_k);
}
- /* 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 );
- }
+ /* cancel running resolver */
+ if (Resolve_INPROGRESS(&My_Connections[Idx].res_stat))
+ Resolve_Shutdown(&My_Connections[Idx].res_stat);
/* Servers: Modify time of next connect attempt? */
Conf_UnsetServer( Idx );
#ifdef ZLIB
/* Clean up zlib, if link was compressed */
- if( Conn_Options( Idx ) & CONN_ZIP )
- {
+ 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 );
-#ifdef DEBUG
- Log( LOG_DEBUG, "Shutdown of connection %d completed.", Idx );
-#endif
+ assert(NumConnections > 0);
+ if (NumConnections)
+ NumConnections--;
+ LogDebug("Shutdown of connection %d completed, %ld connection%s left.",
+ Idx, NumConnections, NumConnections != 1 ? "s" : "");
} /* Conn_Close */
-GLOBAL VOID
-Conn_SyncServerStruct( VOID )
+GLOBAL void
+Conn_SyncServerStruct( void )
{
/* Synchronize server structures (connection IDs):
* connections <-> configuration */
CLIENT *client;
CONN_ID i;
- INT c;
+ int c;
- for( i = 0; i < Pool_Size; i++ )
- {
+ for( i = 0; i < Pool_Size; i++ ) {
/* Established connection? */
- if( My_Connections[i].sock <= NONE ) continue;
+ if (My_Connections[i].sock < 0)
+ continue;
/* Server connection? */
- client = Client_GetFromConn( i );
+ client = Conn_GetClient( i );
if(( ! client ) || ( Client_Type( client ) != CLIENT_SERVER )) continue;
for( c = 0; c < MAX_SERVERS; c++ )
if( ! Conf_Server[c].host[0] ) continue;
/* Duplicate? */
- if( strcmp( Conf_Server[c].name, Client_ID( client )) == 0 ) Conf_Server[c].conn_id = i;
+ if( strcmp( Conf_Server[c].name, Client_ID( client )) == 0 )
+ Conf_Server[c].conn_id = i;
}
}
} /* SyncServerStruct */
-LOCAL BOOLEAN
-Try_Write( CONN_ID Idx )
+/**
+ * Send out data of write buffer; connect new sockets.
+ */
+static bool
+Handle_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;
+ ssize_t len;
+ size_t wdatalen;
assert( Idx > NONE );
+ if ( My_Connections[Idx].sock < 0 ) {
+ LogDebug("Handle_Write() on closed socket, connection %d", Idx);
+ return false;
+ }
assert( My_Connections[Idx].sock > NONE );
- /* sind ueberhaupt Daten vorhanden? */
+ wdatalen = array_bytes(&My_Connections[Idx].wbuf );
+
#ifdef ZLIB
- if(( ! My_Connections[Idx].wdatalen > 0 ) && ( ! My_Connections[Idx].zip.wdatalen )) return TRUE;
-#else
- if( ! My_Connections[Idx].wdatalen > 0 ) return TRUE;
+ if (wdatalen == 0) {
+ /* Write buffer is empty, so we try to flush the compression
+ * buffer and get some data to work with from there :-) */
+ if (!Zip_Flush(Idx))
+ return false;
+
+ /* Now the write buffer most probably has changed: */
+ wdatalen = array_bytes(&My_Connections[Idx].wbuf);
+ }
#endif
- /* Timeout initialisieren: 0 Sekunden, also nicht blockieren */
- tv.tv_sec = 0; tv.tv_usec = 0;
+ if (wdatalen == 0) {
+ /* Still no data, fine. */
+ io_event_del(My_Connections[Idx].sock, IO_WANTWRITE );
+ return true;
+ }
- 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. */
+ LogDebug
+ ("Handle_Write() called for connection %d, %ld bytes pending ...",
+ Idx, wdatalen);
- New_Connection( Sock );
- }
- else if( FD_ISSET( Sock, &Resolver_FDs ))
+#ifdef SSL_SUPPORT
+ if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_SSL )) {
+ len = ConnSSL_Write(&My_Connections[Idx], array_start(&My_Connections[Idx].wbuf), wdatalen);
+ } else
+#endif
{
- /* Rueckmeldung von einem Resolver Sub-Prozess */
-
- Read_Resolver_Result( Sock );
+ len = write(My_Connections[Idx].sock,
+ array_start(&My_Connections[Idx].wbuf), wdatalen );
}
- else
- {
- /* Ein Client Socket: entweder ein User oder Server */
-
- idx = Socket2Index( Sock );
- if( idx > NONE ) Read_Request( idx );
+ if( len < 0 ) {
+ if (errno == EAGAIN || errno == EINTR)
+ return true;
+
+ 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;
}
-} /* Handle_Read */
+ /* move any data not yet written to beginning */
+ array_moveleft(&My_Connections[Idx].wbuf, 1, (size_t)len);
-LOCAL BOOLEAN
-Handle_Write( CONN_ID Idx )
-{
- /* Daten aus Schreibpuffer versenden bzw. Connection aufbauen */
-
- INT len, res, err;
- socklen_t sock_len;
- CLIENT *c;
-
- assert( Idx > NONE );
- 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 */
- 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 );
- }
-
-#ifdef ZLIB
- /* Schreibpuffer leer, aber noch Daten im Kompressionsbuffer?
- * Dann muss dieser nun geflushed werden! */
- if( My_Connections[Idx].wdatalen == 0 ) Zip_Flush( Idx );
-#endif
+ return true;
+} /* Handle_Write */
- 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;
+static int
+Count_Connections(ng_ipaddr_t *a)
+{
+ int i, cnt;
- /* 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;
+ cnt = 0;
+ for (i = 0; i < Pool_Size; i++) {
+ if (My_Connections[i].sock <= NONE)
+ continue;
+ if (ng_ipaddr_ipequal(&My_Connections[i].addr, a))
+ cnt++;
}
-
- /* Puffer anpassen */
- My_Connections[Idx].wdatalen -= len;
- memmove( My_Connections[Idx].wbuf, My_Connections[Idx].wbuf + len, My_Connections[Idx].wdatalen );
-
- return TRUE;
-} /* Handle_Write */
+ return cnt;
+} /* Count_Connections */
-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;
- RES_STAT *s;
- CONN_ID idx;
+ ng_ipaddr_t new_addr;
+ char ip_str[NG_INET_ADDRSTRLEN];
+ int new_sock, new_sock_len, identsock;
CLIENT *c;
- POINTER *ptr;
- LONG new_size, cnt;
+ long 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;
+ new_sock_len = (int)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 -1;
+ }
+
+ if (!ng_ipaddr_tostr_r(&new_addr, ip_str)) {
+ Log(LOG_CRIT, "fd %d: Can't convert IP address!", new_sock);
+ Simple_Message(new_sock, "ERROR :Internal Server Error");
+ close(new_sock);
+ 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 ));
+ if (!hosts_access(&req)) {
+ Log (deny_severity, "Refused connection from %s (by TCP Wrappers)!", ip_str);
Simple_Message( new_sock, "ERROR :Connection refused" );
close( new_sock );
- return;
+ return -1;
}
#endif
/* Socket initialisieren */
- Init_Socket( new_sock );
-
+ if (!Init_Socket( new_sock ))
+ return -1;
+
/* Check IP-based connection limit */
- cnt = Count_Connections( new_addr );
- if(( Conf_MaxConnectionsIP > 0 ) && ( cnt >= Conf_MaxConnectionsIP ))
- {
+ 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);
+ Log( LOG_ERR, "Refused connection from %s: too may connections (%ld) from this IP address!", ip_str, 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 */
- for( idx = 0; idx < Pool_Size; idx++ ) if( My_Connections[idx].sock == NONE ) break;
- if( idx >= Pool_Size )
+ if ((Conf_MaxConnections > 0) &&
+ (NumConnections >= (size_t) Conf_MaxConnections))
{
- new_size = Pool_Size + CONNECTION_POOL;
-
- /* Im bisherigen Pool wurde keine freie Connection-Struktur mehr gefunden.
- * Wenn erlaubt und moeglich muss nun der Pool vergroessert werden: */
-
- if( Conf_MaxConnections > 0 )
- {
- /* Es ist ein Limit konfiguriert */
- if( Pool_Size >= Conf_MaxConnections )
- {
- /* Mehr Verbindungen duerfen wir leider nicht mehr annehmen ... */
- Log( LOG_ALERT, "Can't accept connection: limit (%d) reached!", Pool_Size );
- Simple_Message( new_sock, "ERROR :Connection limit reached" );
- close( new_sock );
- return;
- }
- if( new_size > Conf_MaxConnections ) new_size = Conf_MaxConnections;
- }
- if( new_size < Pool_Size )
- {
- Log( LOG_ALERT, "Can't accespt connection: limit (%d) reached -- overflow!", Pool_Size );
- Simple_Message( new_sock, "ERROR :Connection limit reached" );
- close( new_sock );
- return;
- }
+ Log( LOG_ALERT, "Can't accept connection: limit (%d) reached!", Conf_MaxConnections);
+ Simple_Message( new_sock, "ERROR :Connection limit reached" );
+ close( new_sock );
+ return -1;
+ }
- ptr = (POINTER *)realloc( My_Connections, sizeof( CONNECTION ) * new_size );
- if( ! ptr )
- {
+ if( new_sock >= Pool_Size ) {
+ if (!array_alloc(&My_ConnArray, sizeof(CONNECTION),
+ (size_t)new_sock)) {
Log( LOG_EMERG, "Can't allocate memory! [New_Connection]" );
Simple_Message( new_sock, "ERROR: Internal error" );
close( new_sock );
- return;
+ return -1;
}
-
-#ifdef DEBUG
- Log( LOG_DEBUG, "Allocated new connection pool for %ld items (%ld bytes). [realloc()]", new_size, sizeof( CONNECTION ) * new_size );
-#endif
+ LogDebug("Bumped connection pool to %ld items (internal: %ld items, %ld bytes)",
+ new_sock, array_length(&My_ConnArray, sizeof(CONNECTION)), array_bytes(&My_ConnArray));
/* 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;
+ My_Connections = array_start(&My_ConnArray);
+ while (Pool_Size <= new_sock)
+ Init_Conn_Struct(Pool_Size++);
}
- /* Client-Struktur initialisieren */
- 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;
+ /* register callback */
+ if (!io_event_create( new_sock, IO_WANTREAD, cb_clientserver)) {
+ Log(LOG_ALERT, "Can't accept connection: io_event_create failed!");
+ Simple_Message(new_sock, "ERROR :Internal error");
+ close(new_sock);
+ return -1;
}
- /* Verbindung registrieren */
- Init_Conn_Struct( idx );
- My_Connections[idx].sock = new_sock;
- My_Connections[idx].addr = new_addr;
+ c = Client_NewLocal(new_sock, ip_str, CLIENT_UNKNOWN, false );
+ if( ! c ) {
+ Log(LOG_ALERT, "Can't accept connection: can't create client structure!");
+ Simple_Message(new_sock, "ERROR :Internal error");
+ io_close(new_sock);
+ return -1;
+ }
- /* Neuen Socket registrieren */
- FD_SET( new_sock, &My_Sockets );
- if( new_sock > Conn_MaxFD ) Conn_MaxFD = new_sock;
+ Init_Conn_Struct( new_sock );
+ My_Connections[new_sock].sock = new_sock;
+ My_Connections[new_sock].addr = new_addr;
+ My_Connections[new_sock].client = c;
- 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 );
+ Log( LOG_INFO, "Accepted connection %d from %s:%d on socket %d.", new_sock,
+ ip_str, ng_ipaddr_getport(&new_addr), Sock);
/* Hostnamen ermitteln */
- strlcpy( My_Connections[idx].host, inet_ntoa( new_addr.sin_addr ), sizeof( My_Connections[idx].host ));
- Client_SetHostname( c, My_Connections[idx].host );
+ strlcpy(My_Connections[new_sock].host, ip_str, sizeof(My_Connections[new_sock].host));
+
+ Client_SetHostname(c, My_Connections[new_sock].host);
+
+ identsock = new_sock;
#ifdef IDENTAUTH
- s = Resolve_Addr( &new_addr, My_Connections[idx].sock );
-#else
- s = Resolve_Addr( &new_addr );
+ if (Conf_NoIdent)
+ identsock = -1;
#endif
- if( s )
- {
- /* Sub-Prozess wurde asyncron gestartet */
- My_Connections[idx].res_stat = s;
- }
-
- /* Penalty-Zeit setzen */
- Conn_SetPenalty( idx, 4 );
+ if (!Conf_NoDNS)
+ Resolve_Addr(&My_Connections[new_sock].res_stat, &new_addr,
+ identsock, cb_Read_Resolver_Result);
+ Conn_SetPenalty(new_sock, 4);
+ return new_sock;
} /* New_Connection */
-LOCAL CONN_ID
-Socket2Index( INT Sock )
+static CONN_ID
+Socket2Index( int Sock )
{
/* zum Socket passende Connection suchen */
- CONN_ID idx;
-
- assert( Sock > NONE );
-
- for( idx = 0; idx < Pool_Size; idx++ ) if( My_Connections[idx].sock == Sock ) break;
+ assert( Sock >= 0 );
- if( idx >= Pool_Size )
- {
+ if( Sock >= Pool_Size || My_Connections[Sock].sock != Sock ) {
/* die Connection wurde vermutlich (wegen eines
* Fehlers) bereits wieder abgebaut ... */
-#ifdef DEBUG
- Log( LOG_DEBUG, "Socket2Index: can't get connection for socket %d!", Sock );
-#endif
+ LogDebug("Socket2Index: can't get connection for socket %d!", Sock);
return NONE;
}
- else return idx;
+ return Sock;
} /* Socket2Index */
-LOCAL VOID
+/**
+ * Read data from the network to the read buffer. If an error occures,
+ * the socket of this connection will be shut down.
+ */
+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
+ ssize_t len;
+ char readbuf[READBUFFER_LEN];
CLIENT *c;
-#endif
-
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) >= READBUFFER_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 );
- Conn_Close( Idx, "Receive buffer overflow!", NULL, FALSE );
+ /* Read buffer is full */
+ 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( 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;
- }
+#ifdef SSL_SUPPORT
+ if (Conn_OPTION_ISSET(&My_Connections[Idx], CONN_SSL))
+ len = ConnSSL_Read( &My_Connections[Idx], readbuf, sizeof(readbuf));
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 ));
- Conn_Close( Idx, "Socket closed!", "Client closed connection", FALSE );
+ len = read(My_Connections[Idx].sock, readbuf, sizeof(readbuf));
+ if (len == 0) {
+ Log(LOG_INFO, "%s:%u (%s) is closing the connection ...",
+ My_Connections[Idx].host,
+ (unsigned int) ng_ipaddr_getport(&My_Connections[Idx].addr),
+ ng_ipaddr_tostr(&My_Connections[Idx].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,
+ (size_t) 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
+ {
+ if (!array_catb( &My_Connections[Idx].rbuf, readbuf, len)) {
+ 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 */
+ /* Update connection statistics */
My_Connections[Idx].bytes_in += len;
- /* Timestamp aktualisieren */
- My_Connections[Idx].lastdata = time( NULL );
+ /* Update timestamp of last data received if this connection is
+ * registered as a user, server or service connection. Don't update
+ * otherwise, so users have at least Conf_PongTimeout seconds time to
+ * register with the IRC server -- see Check_Connections().
+ * Set "lastping", too, so we can handle time shifts backwards ... */
+ c = Conn_GetClient(Idx);
+ if (c && (Client_Type(c) == CLIENT_USER
+ || Client_Type(c) == CLIENT_SERVER
+ || Client_Type(c) == CLIENT_SERVICE)) {
+ My_Connections[Idx].lastdata = time(NULL);
+ My_Connections[Idx].lastping = My_Connections[Idx].lastdata;
+ }
- Handle_Buffer( Idx );
+ /* Look at the data in the (read-) buffer of this connection */
+ Handle_Buffer(Idx);
} /* Read_Request */
-LOCAL BOOLEAN
-Handle_Buffer( CONN_ID Idx )
+/**
+ * Handle all data in the connection read-buffer.
+ * All data is precessed until no complete command is left. When a fatal
+ * error occurs, the connection is shut down.
+ */
+static void
+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). */
-
#ifndef STRICT_RFC
- CHAR *ptr1, *ptr2;
+ char *ptr1, *ptr2, *first_eol;
#endif
- CHAR *ptr;
- INT len, delta;
- BOOLEAN action, result;
+ char *ptr;
+ size_t len, delta;
+ time_t starttime;
#ifdef ZLIB
- BOOLEAN old_z;
+ bool old_z;
#endif
- result = FALSE;
- do
- {
+ starttime = time(NULL);
+ for (;;) {
/* Check penalty */
- if( My_Connections[Idx].delaytime > time( NULL )) return result;
-
+ if (My_Connections[Idx].delaytime > starttime)
+ return;
#ifdef ZLIB
- /* ggf. noch unkomprimiete Daten weiter entpacken */
- if( My_Connections[Idx].options & CONN_ZIP )
- {
- if( ! Unzip_Buffer( Idx )) return FALSE;
+ /* Unpack compressed data, if compression is in use */
+ if (Conn_OPTION_ISSET(&My_Connections[Idx], CONN_ZIP)) {
+ /* When unzipping fails, Unzip_Buffer() shuts
+ * down the connection itself */
+ if (!Unzip_Buffer(Idx))
+ return;
}
#endif
- if( My_Connections[Idx].rdatalen < 1 ) break;
+ if (0 == array_bytes(&My_Connections[Idx].rbuf))
+ return;
+
+ /* Make sure that the buffer is NULL terminated */
+ if (!array_cat0_temporary(&My_Connections[Idx].rbuf)) {
+ Conn_Close(Idx, NULL,
+ "Can't allocate memory [Handle_Buffer]",
+ true);
+ return;
+ }
- /* 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" );
+ /* RFC 2812, section "2.3 Messages", 5th paragraph:
+ * "IRC messages are always lines of characters terminated
+ * with a CR-LF (Carriage Return - Line Feed) pair [...]". */
+ delta = 2;
+ ptr = strstr(array_start(&My_Connections[Idx].rbuf), "\r\n");
- if( ptr ) delta = 2;
#ifndef STRICT_RFC
- else
- {
- /* Nicht RFC-konforme Anfrage mit nur CR oder LF? Leider
- * machen soetwas viele Clients, u.a. "mIRC" :-( */
- ptr1 = strchr( My_Connections[Idx].rbuf, '\r' );
- ptr2 = strchr( My_Connections[Idx].rbuf, '\n' );
+ /* Check for non-RFC-compliant request (only CR or LF)?
+ * Unfortunately, there are quite a few clients out there
+ * that do this -- e. g. mIRC, BitchX, and Trillian :-( */
+ ptr1 = strchr(array_start(&My_Connections[Idx].rbuf), '\r');
+ ptr2 = strchr(array_start(&My_Connections[Idx].rbuf), '\n');
+ if (ptr) {
+ /* Check if there is a single CR or LF _before_ the
+ * corerct CR+LF line terminator: */
+ first_eol = ptr1 < ptr2 ? ptr1 : ptr2;
+ if (first_eol < ptr) {
+ /* Single CR or LF before CR+LF found */
+ ptr = first_eol;
+ delta = 1;
+ }
+ } else if (ptr1 || ptr2) {
+ /* No CR+LF terminated command found, but single
+ * CR or LF found ... */
+ if (ptr1 && ptr2)
+ ptr = ptr1 < ptr2 ? ptr1 : ptr2;
+ else
+ ptr = ptr1 ? ptr1 : ptr2;
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;
- }
+ if (!ptr)
+ return;
+
+ /* Complete (=line terminated) request found, handle it! */
+ *ptr = '\0';
+
+ len = ptr - (char *)array_start(&My_Connections[Idx].rbuf) + delta;
+
+ if (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;
+ }
+
+ if (len <= delta) {
+ /* Request is empty (only '\r\n', '\r' or '\n');
+ * delta is 2 ('\r\n') or 1 ('\r' or '\n'), see above */
+ array_moveleft(&My_Connections[Idx].rbuf, 1, len);
+ return;
+ }
#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;
- }
-
- /* Puffer anpassen */
- My_Connections[Idx].rdatalen -= len;
- memmove( My_Connections[Idx].rbuf, My_Connections[Idx].rbuf + len, My_Connections[Idx].rdatalen );
+ My_Connections[Idx].msg_in++;
+ if (!Parse_Request
+ (Idx, (char *)array_start(&My_Connections[Idx].rbuf)))
+ return;
+ array_moveleft(&My_Connections[Idx].rbuf, 1, len);
+ LogDebug("Connection %d: %d bytes left in read buffer.",
+ Idx, array_bytes(&My_Connections[Idx].rbuf));
#ifdef ZLIB
- if(( ! old_z ) && ( My_Connections[Idx].options & CONN_ZIP ) && ( My_Connections[Idx].rdatalen > 0 ))
- {
- /* Mit dem letzten Befehl wurde Socket-Kompression aktiviert.
- * Evtl. schon vom Socket gelesene Daten in den Unzip-Puffer
- * umkopieren, damit diese nun zunaechst entkomprimiert werden */
- if( My_Connections[Idx].rdatalen > ZREADBUFFER_LEN )
- {
- /* Hupsa! Soviel Platz haben wir aber gar nicht! */
- Log( LOG_ALERT, "Can't move receive buffer: No space left in unzip buffer (need %d bytes)!", My_Connections[Idx].rdatalen );
- return FALSE;
- }
- memcpy( My_Connections[Idx].zip.rbuf, My_Connections[Idx].rbuf, My_Connections[Idx].rdatalen );
- My_Connections[Idx].zip.rdatalen = My_Connections[Idx].rdatalen;
- My_Connections[Idx].rdatalen = 0;
-#ifdef DEBUG
- Log( LOG_DEBUG, "Moved already received data (%d bytes) to uncompression buffer.", My_Connections[Idx].zip.rdatalen );
-#endif /* DEBUG */
+ 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 the unzip buffer for decompression: */
+ if (!array_copy
+ (&My_Connections[Idx].zip.rbuf,
+ &My_Connections[Idx].rbuf)) {
+ Conn_Close(Idx, NULL,
+ "Can't allocate memory [Handle_Buffer]",
+ true);
+ return;
}
-#endif /* ZLIB */
- }
- if( action ) result = TRUE;
- } while( action );
-
- return result;
+ array_trunc(&My_Connections[Idx].rbuf);
+ LogDebug
+ ("Moved already received data (%u bytes) to uncompression buffer.",
+ array_bytes(&My_Connections[Idx].zip.rbuf));
+ }
+#endif
+ }
} /* 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;
CONN_ID i;
- for( i = 0; i < Pool_Size; i++ )
- {
- if( My_Connections[i].sock == NONE ) continue;
+ for (i = 0; i < Pool_Size; i++) {
+ if (My_Connections[i].sock < 0)
+ 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 )
- {
+ c = Conn_GetClient(i);
+ if (c && ((Client_Type(c) == CLIENT_USER)
+ || (Client_Type(c) == CLIENT_SERVER)
+ || (Client_Type(c) == CLIENT_SERVICE))) {
+ /* 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 );
-#endif
- Conn_Close( i, NULL, "Ping timeout", TRUE );
+ LogDebug
+ ("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) {
+ /* We need to send a PING ... */
+ LogDebug("Connection %d: sending PING ...", i);
+ My_Connections[i].lastping = time(NULL);
+ Conn_WriteStr(i, "PING :%s",
+ Client_ID(Client_ThisServer()));
}
- else if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout )
- {
- /* es muss ein PING gesendet werden */
-#ifdef DEBUG
- Log( LOG_DEBUG, "Connection %d: sending PING ...", i );
-#endif
- My_Connections[i].lastping = time( NULL );
- Conn_WriteStr( i, "PING :%s", Client_ID( Client_ThisServer( )));
- }
- }
- else
- {
- /* noch nicht vollstaendig aufgebaute Verbindung */
- if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout )
- {
- /* Timeout */
-#ifdef DEBUG
- Log( LOG_DEBUG, "Connection %d timed out ...", i );
-#endif
- Conn_Close( i, NULL, "Timeout", FALSE );
+ } else {
+ /* The connection is not fully established yet, so
+ * we don't do the PING-PONG game here but instead
+ * disconnect the client after "a short time" if it's
+ * still not registered. */
+
+ if (My_Connections[i].lastdata <
+ time(NULL) - Conf_PongTimeout) {
+ LogDebug
+ ("Unregistered connection %d timed out ...",
+ i);
+ Conn_Close(i, NULL, "Timeout", false);
}
}
}
} /* Check_Connections */
-LOCAL VOID
-Check_Servers( VOID )
+static void
+Check_Servers( void )
{
/* Check if we can establish further server links */
- RES_STAT *s;
- CONN_ID idx;
- INT i, n;
-
- /* Serach all connections, are there results from the resolver? */
- for( idx = 0; idx < Pool_Size; idx++ )
- {
- if( My_Connections[idx].sock != SERVER_WAIT ) continue;
-
- /* IP resolved? */
- if( My_Connections[idx].res_stat == NULL ) New_Server( Conf_GetServer( idx ), idx );
- }
+ int i, n;
+ time_t time_now;
/* Check all configured servers */
- for( i = 0; i < MAX_SERVERS; i++ )
- {
+ 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;
+ 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;
/* Is there already a connection in this group? */
- if( Conf_Server[i].group > NONE )
- {
- for( n = 0; n < MAX_SERVERS; n++ )
- {
- if( n == i ) continue;
- if(( Conf_Server[n].conn_id > NONE ) && ( Conf_Server[n].group == Conf_Server[i].group )) break;
+ if( Conf_Server[i].group > NONE ) {
+ for (n = 0; n < MAX_SERVERS; n++) {
+ if (n == i) continue;
+ if ((Conf_Server[n].conn_id != NONE) &&
+ (Conf_Server[n].group == Conf_Server[i].group))
+ break;
}
- if( n < MAX_SERVERS ) continue;
+ if (n < MAX_SERVERS) continue;
}
/* Check last connect attempt? */
- if( Conf_Server[i].lasttry > time( NULL ) - Conf_ConnectRetry ) continue;
+ time_now = time(NULL);
+ if( Conf_Server[i].lasttry > (time_now - Conf_ConnectRetry))
+ continue;
/* Okay, try to connect now */
- Conf_Server[i].lasttry = time( NULL );
-
- /* 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;
- Conf_Server[i].conn_id = idx;
-
- /* Resolve Hostname. If this fails, try to use it as an IP address */
- strlcpy( Conf_Server[i].ip, Conf_Server[i].host, sizeof( Conf_Server[i].ip ));
- strlcpy( My_Connections[idx].host, Conf_Server[i].host, sizeof( My_Connections[idx].host ));
- s = Resolve_Name( Conf_Server[i].host );
- if( s )
- {
- /* Sub-Prozess wurde asyncron gestartet */
- My_Connections[idx].res_stat = s;
- }
+ Conf_Server[i].lasttry = time_now;
+ Conf_Server[i].conn_id = SERVER_WAIT;
+ assert(Resolve_Getfd(&Conf_Server[i].res_stat) < 0);
+ Resolve_Name(&Conf_Server[i].res_stat, Conf_Server[i].host, cb_Connect_to_Server);
}
} /* Check_Servers */
-LOCAL VOID
-New_Server( INT Server, CONN_ID Idx )
+static void
+New_Server( int Server , ng_ipaddr_t *dest)
{
/* Establish new server link */
-
- struct sockaddr_in new_addr;
- struct in_addr inaddr;
- INT res, new_sock;
+ char ip_str[NG_INET_ADDRSTRLEN];
+ int af_dest, res, new_sock;
CLIENT *c;
assert( Server > NONE );
- assert( Idx > NONE );
- /* Did we get a valid IP address? */
- 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 );
+ if (!ng_ipaddr_tostr_r(dest, ip_str)) {
+ Log(LOG_WARNING, "New_Server: Could not convert IP to string");
return;
}
- Log( LOG_INFO, "Establishing connection to \"%s\", %s, port %d (connection %d) ... ", Conf_Server[Server].host, Conf_Server[Server].ip, Conf_Server[Server].port, Idx );
+ Log( LOG_INFO, "Establishing connection to \"%s\", %s, port %d ... ",
+ Conf_Server[Server].host, ip_str, Conf_Server[Server].port );
-#ifdef HAVE_INET_ATON
- if( inet_aton( Conf_Server[Server].ip, &inaddr ) == 0 )
-#else
- memset( &inaddr, 0, sizeof( inaddr ));
- inaddr.s_addr = inet_addr( Conf_Server[Server].ip );
- if( inaddr.s_addr == (unsigned)-1 )
-#endif
- {
- /* 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 );
+ af_dest = ng_ipaddr_af(dest);
+ new_sock = socket(af_dest, SOCK_STREAM, 0);
+ if (new_sock < 0) {
+ Log( LOG_CRIT, "Can't create socket (af %d) : %s!", af_dest, strerror( errno ));
return;
}
- memset( &new_addr, 0, sizeof( new_addr ));
- new_addr.sin_family = AF_INET;
- new_addr.sin_addr = inaddr;
- new_addr.sin_port = htons( Conf_Server[Server].port );
-
- new_sock = socket( PF_INET, SOCK_STREAM, 0 );
- if ( new_sock < 0 )
- {
- /* Can't create socket */
- Init_Conn_Struct( Idx );
- Conf_Server[Server].conn_id = NONE;
- Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
+ if (!Init_Socket(new_sock))
return;
- }
-
- if( ! Init_Socket( new_sock )) return;
- res = connect( new_sock, (struct sockaddr *)&new_addr, sizeof( new_addr ));
- if(( res != 0 ) && ( errno != EINPROGRESS ))
+ /* is a bind address configured? */
+ res = ng_ipaddr_af(&Conf_Server[Server].bind_addr);
+ /* if yes, bind now. If it fails, warn and let connect() pick a source address */
+ if (res && bind(new_sock, (struct sockaddr *) &Conf_Server[Server].bind_addr,
+ ng_ipaddr_salen(&Conf_Server[Server].bind_addr)))
{
- /* Can't connect socket */
+ ng_ipaddr_tostr_r(&Conf_Server[Server].bind_addr, ip_str);
+ Log(LOG_WARNING, "Can't bind socket to %s: %s!", ip_str, strerror(errno));
+ }
+ ng_ipaddr_setport(dest, Conf_Server[Server].port);
+ res = connect(new_sock, (struct sockaddr *) dest, ng_ipaddr_salen(dest));
+ if(( res != 0 ) && ( errno != EINPROGRESS )) {
Log( LOG_CRIT, "Can't connect socket: %s!", strerror( errno ));
close( new_sock );
- Init_Conn_Struct( Idx );
- Conf_Server[Server].conn_id = NONE;
return;
}
- /* Client-Struktur initialisieren */
- c = Client_NewLocal( Idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWNSERVER, FALSE );
- if( ! c )
- {
- /* Can't create new client structure */
+ if (!array_alloc(&My_ConnArray, sizeof(CONNECTION), (size_t)new_sock)) {
+ Log(LOG_ALERT,
+ "Cannot allocate memory for server connection (socket %d)",
+ new_sock);
close( new_sock );
- Init_Conn_Struct( Idx );
- Conf_Server[Server].conn_id = NONE;
+ return;
+ }
+
+ My_Connections = array_start(&My_ConnArray);
+
+ assert(My_Connections[new_sock].sock <= 0);
+
+ Init_Conn_Struct(new_sock);
+
+ ng_ipaddr_tostr_r(dest, ip_str);
+ c = Client_NewLocal(new_sock, ip_str, CLIENT_UNKNOWNSERVER, false);
+ if (!c) {
Log( LOG_ALERT, "Can't establish connection: can't create client structure!" );
+ close( new_sock );
return;
}
+
Client_SetIntroducer( c, c );
Client_SetToken( c, TOKEN_OUTBOUND );
/* Register connection */
- My_Connections[Idx].sock = new_sock;
- My_Connections[Idx].addr = new_addr;
- strlcpy( My_Connections[Idx].host, Conf_Server[Server].host, sizeof( My_Connections[Idx].host ));
+ Conf_Server[Server].conn_id = new_sock;
+ My_Connections[new_sock].sock = new_sock;
+ My_Connections[new_sock].addr = *dest;
+ My_Connections[new_sock].client = c;
+ strlcpy( My_Connections[new_sock].host, Conf_Server[Server].host,
+ sizeof(My_Connections[new_sock].host ));
/* Register new socket */
- FD_SET( new_sock, &My_Sockets );
- FD_SET( new_sock, &My_Connects );
- if( new_sock > Conn_MaxFD ) Conn_MaxFD = new_sock;
-
-#ifdef DEBUG
- Log( LOG_DEBUG, "Registered new connection %d on socket %d.", Idx, My_Connections[Idx].sock );
+ 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( new_sock, "io_event_create() failed", NULL, false );
+ Init_Conn_Struct( new_sock );
+ Conf_Server[Server].conn_id = NONE;
+ }
+#ifdef SSL_SUPPORT
+ if (Conf_Server[Server].SSLConnect && !ConnSSL_PrepareConnect( &My_Connections[new_sock],
+ &Conf_Server[Server] ))
+ {
+ Log(LOG_ALERT, "Could not initialize SSL for outgoing connection");
+ Conn_Close( new_sock, "Could not initialize SSL for outgoing connection", NULL, false );
+ Init_Conn_Struct( new_sock );
+ Conf_Server[Server].conn_id = NONE;
+ }
#endif
+ NumConnections++;
+ LogDebug("Registered new connection %d on socket %d (%ld in total).",
+ new_sock, My_Connections[new_sock].sock, NumConnections);
+ Conn_OPTION_ADD( &My_Connections[new_sock], CONN_ISCONNECTING );
} /* New_Server */
-LOCAL VOID
-Init_Conn_Struct( CONN_ID Idx )
+/**
+ * Initialize connection structure.
+ */
+static void
+Init_Conn_Struct(CONN_ID Idx)
{
- /* Connection-Struktur initialisieren */
-
- 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].starttime = time( NULL );
- My_Connections[Idx].lastdata = time( NULL );
- My_Connections[Idx].lastping = 0;
- My_Connections[Idx].lastprivmsg = time( NULL );
- My_Connections[Idx].delaytime = 0;
- My_Connections[Idx].bytes_in = 0;
- My_Connections[Idx].bytes_out = 0;
- My_Connections[Idx].msg_in = 0;
- My_Connections[Idx].msg_out = 0;
- My_Connections[Idx].flag = 0;
- My_Connections[Idx].options = 0;
-
-#ifdef ZLIB
- My_Connections[Idx].zip.rbuf[0] = '\0';
- My_Connections[Idx].zip.rdatalen = 0;
- My_Connections[Idx].zip.wbuf[0] = '\0';
- My_Connections[Idx].zip.wdatalen = 0;
- My_Connections[Idx].zip.bytes_in = 0;
- My_Connections[Idx].zip.bytes_out = 0;
-#endif
+ time_t now = time(NULL);
+
+ memset(&My_Connections[Idx], 0, sizeof(CONNECTION));
+ My_Connections[Idx].sock = -1;
+ My_Connections[Idx].signon = now;
+ My_Connections[Idx].lastdata = now;
+ My_Connections[Idx].lastprivmsg = now;
+ Resolve_Init(&My_Connections[Idx].res_stat);
} /* Init_Conn_Struct */
-LOCAL BOOLEAN
-Init_Socket( INT Sock )
+static bool
+Init_Socket( int Sock )
{
/* Initialize socket (set options) */
- INT value;
+ 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;
+ return false;
}
-#endif
/* Don't block this port after socket shutdown */
value = 1;
/* 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
+ LogDebug("Setting option IP_TOS on socket %d to IPTOS_LOWDELAY (%d).", Sock, value );
if( setsockopt( Sock, SOL_IP, IP_TOS, &value, (socklen_t)sizeof( value )) != 0 )
{
Log( LOG_ERR, "Can't set socket option IP_TOS: %s!", strerror( errno ));
}
#endif
- return TRUE;
+ return true;
} /* Init_Socket */
-LOCAL VOID
-Read_Resolver_Result( INT r_fd )
+
+static void
+cb_Connect_to_Server(int fd, UNUSED short events)
+{
+ /* Read result of resolver sub-process from pipe and start connection */
+ int i;
+ size_t len;
+ ng_ipaddr_t dest_addrs[4]; /* we can handle at most 3; but we read up to
+ four so we can log the 'more than we can handle'
+ condition */
+
+ LogDebug("Resolver: Got forward lookup callback on fd %d, events %d", fd, events);
+
+ for (i=0; i < MAX_SERVERS; i++) {
+ if (Resolve_Getfd(&Conf_Server[i].res_stat) == fd )
+ break;
+ }
+
+ if( i >= MAX_SERVERS) {
+ /* Ops, no matching server found?! */
+ io_close( fd );
+ LogDebug("Resolver: Got Forward Lookup callback for unknown server!?");
+ return;
+ }
+
+ /* Read result from pipe */
+ len = Resolve_Read(&Conf_Server[i].res_stat, dest_addrs, sizeof(dest_addrs));
+ if (len == 0)
+ return;
+
+ assert((len % sizeof(ng_ipaddr_t)) == 0);
+
+ LogDebug("Got result from resolver: %u structs (%u bytes).", len/sizeof(ng_ipaddr_t), len);
+
+ memset(&Conf_Server[i].dst_addr, 0, sizeof(&Conf_Server[i].dst_addr));
+ if (len > sizeof(ng_ipaddr_t)) {
+ /* more than one address for this hostname, remember them
+ * in case first address is unreachable/not available */
+ len -= sizeof(ng_ipaddr_t);
+ if (len > sizeof(&Conf_Server[i].dst_addr)) {
+ len = sizeof(&Conf_Server[i].dst_addr);
+ Log(LOG_NOTICE, "Notice: Resolver returned more IP Addresses for host than we can handle,"
+ " additional addresses dropped");
+ }
+ memcpy(&Conf_Server[i].dst_addr, &dest_addrs[1], len);
+ }
+ /* connect() */
+ New_Server(i, dest_addrs);
+} /* cb_Read_Forward_Lookup */
+
+
+static void
+cb_Read_Resolver_Result( int r_fd, UNUSED short events )
{
/* Read result of resolver sub-process from pipe and update the
* apropriate connection/client structure(s): hostname and/or
* IDENT user name.*/
CLIENT *c;
- INT len, i, n;
- RES_STAT *s;
- CHAR *ptr;
+ int i;
+ size_t len;
+ char *identptr;
+#ifdef IDENTAUTH
+ char readbuf[HOST_LEN + 2 + CLIENT_USER_LEN];
+#else
+ char readbuf[HOST_LEN + 1];
+#endif
+
+ LogDebug("Resolver: Got callback on fd %d, events %d", r_fd, events );
/* Search associated connection ... */
- for( i = 0; i < Pool_Size; i++ )
- {
+ for( i = 0; i < Pool_Size; i++ ) {
if(( My_Connections[i].sock != NONE )
- && ( My_Connections[i].res_stat != NULL )
- && ( My_Connections[i].res_stat->pipe[0] == r_fd ))
+ && ( Resolve_Getfd(&My_Connections[i].res_stat) == r_fd ))
break;
}
- if( i >= Pool_Size )
- {
+ if( i >= Pool_Size ) {
/* Ops, none found? Probably the connection has already
* been closed!? We'll ignore that ... */
- FD_CLR( r_fd, &Resolver_FDs );
- close( r_fd );
-#ifdef DEBUG
- Log( LOG_DEBUG, "Resolver: Got result for unknown connection!?" );
-#endif
+ io_close( r_fd );
+ LogDebug("Resolver: Got callback for unknown connection!?");
return;
}
- /* Get resolver structure */
- s = My_Connections[i].res_stat;
- assert( s != NULL );
-
/* Read result from pipe */
- len = read( r_fd, s->buffer + s->bufpos, sizeof( s->buffer ) - s->bufpos - 1 );
- if( len < 0 )
- {
- /* Error! */
- close( r_fd );
- Log( LOG_CRIT, "Resolver: Can't read result: %s!", strerror( errno ));
+ len = Resolve_Read(&My_Connections[i].res_stat, readbuf, sizeof readbuf -1);
+ if (len == 0)
return;
- }
- s->bufpos += len;
- s->buffer[s->bufpos] = '\0';
- /* If the result string is incomplete, return to main loop and
- * wait until we can read in more bytes. */
-#ifdef IDENTAUTH
-try_resolve:
-#endif
- ptr = strchr( s->buffer, '\n' );
- if( ! ptr ) return;
- *ptr = '\0';
-
-#ifdef DEBUG
- Log( LOG_DEBUG, "Got result from resolver: \"%s\" (%d bytes), stage %d.", s->buffer, len, s->stage );
-#endif
+ readbuf[len] = '\0';
+ identptr = strchr(readbuf, '\n');
+ assert(identptr != NULL);
+ if (!identptr) {
+ Log( LOG_CRIT, "Resolver: Got malformed result!");
+ return;
+ }
+ *identptr = '\0';
+ LogDebug("Got result from resolver: \"%s\" (%u bytes read).", readbuf, len);
/* Okay, we got a complete result: this is a host name for outgoing
- * connections and a host name or IDENT user name (if enabled) for
- * incoming conneciions.*/
- if( My_Connections[i].sock > NONE )
- {
- /* Incoming connection */
-
- /* 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 );
-
+ * connections and a host name and IDENT user name (if enabled) for
+ * incoming connections.*/
+ assert ( My_Connections[i].sock >= 0 );
+ /* Incoming connection. Search client ... */
+ c = Conn_GetClient( i );
+ assert( c != NULL );
+
+ /* Only update client information of unregistered clients */
+ if( Client_Type( c ) == CLIENT_UNKNOWN ) {
+ strlcpy(My_Connections[i].host, readbuf, sizeof( My_Connections[i].host));
+ Client_SetHostname( c, readbuf);
#ifdef IDENTAUTH
- /* clean up buffer for IDENT result */
- len = strlen( s->buffer ) + 1;
- memmove( s->buffer, s->buffer + len, sizeof( s->buffer ) - len );
- s->bufpos -= len;
-
- /* Don't close pipe and clean up, but
- * instead wait for IDENT result */
- s->stage = 1;
- goto try_resolve;
- }
- else if( s->stage == 1 )
- {
- /* IDENT user name */
- if( s->buffer[0] )
- {
- Log( LOG_INFO, "IDENT lookup for connection %ld: \"%s\".", i, s->buffer );
- Client_SetUser( c, s->buffer, TRUE );
- }
- else Log( LOG_INFO, "IDENT lookup for connection %ld: no result.", i );
-#endif
- }
- else Log( LOG_ERR, "Resolver: got result for unknown stage %d!?", s->stage );
+ ++identptr;
+ if (*identptr) {
+ Log(LOG_INFO, "IDENT lookup for connection %d: \"%s\".", i, identptr);
+ Client_SetUser(c, identptr, true);
+ } else {
+ Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i);
}
+#endif
+ }
#ifdef DEBUG
else Log( LOG_DEBUG, "Resolver: discarding result for already registered connection %d.", i );
#endif
- }
- else
- {
- /* Outgoing connection (server link): set the IP address
- * so that we can connect to it in the main loop. */
-
- /* Search server ... */
- n = Conf_GetServer( i );
- assert( n > NONE );
-
- strlcpy( Conf_Server[n].ip, s->buffer, 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;
-
/* Reset penalty time */
Conn_ResetPenalty( i );
-} /* Read_Resolver_Result */
+} /* cb_Read_Resolver_Result */
-LOCAL VOID
-Simple_Message( INT Sock, CHAR *Msg )
+static void
+Simple_Message( int Sock, const char *Msg )
{
+ char buf[COMMAND_LEN];
+ size_t 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);
+ len = strlcat( buf, "\r\n", sizeof buf);
+ (void)write(Sock, buf, len);
} /* Simple_Error */
-LOCAL INT
-Count_Connections( struct sockaddr_in addr_in )
+GLOBAL CLIENT *
+Conn_GetClient( CONN_ID Idx )
{
- INT i, cnt;
-
- cnt = 0;
- for( i = 0; i < Pool_Size; i++ )
- {
- if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].addr.sin_addr.s_addr == addr_in.sin_addr.s_addr )) cnt++;
- }
- return cnt;
-} /* Count_Connections */
+ /* return Client-Structure that belongs to the local Connection Idx.
+ * If none is found, return NULL.
+ */
+ CONNECTION *c;
+ assert( Idx >= 0 );
+
+ c = array_get(&My_ConnArray, sizeof (CONNECTION), (size_t)Idx);
+ assert(c != NULL);
+ return c ? c->client : NULL;
+}
+
+#ifdef SSL_SUPPORT
+/* we cannot access My_Connections in irc-info.c */
+GLOBAL bool
+Conn_GetCipherInfo(CONN_ID Idx, char *buf, size_t len)
+{
+ return ConnSSL_GetCipherInfo(&My_Connections[Idx], buf, len);
+}
+
+
+GLOBAL bool
+Conn_UsesSSL(CONN_ID Idx)
+{
+ return Conn_OPTION_ISSET(&My_Connections[Idx], CONN_SSL);
+}
+#endif
/* -eof- */
projects / ngircd-alex.git / blobdiff