/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 Alexander Barton <alex@barton.de>
+ * Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information.
- *
- * Connection management
*/
+#undef DEBUG_BUFFER
#define CONN_MODULE
#include "portab.h"
+#include "conf-ssl.h"
#include "io.h"
-static char UNUSED id[] = "$Id: conn.c,v 1.164 2005/07/13 16:06:55 fw Exp $";
+/**
+ * @file
+ * Connection management
+ */
#include "imp.h"
#include <assert.h>
#ifdef PROTOTYPES
-# include <stdarg.h>
+# include <stdarg.h>
#else
-# include <varargs.h>
+# include <varargs.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <netinet/in.h>
#ifdef HAVE_NETINET_IP_H
+# ifdef HAVE_NETINET_IN_SYSTM_H
+# include <netinet/in_systm.h>
+# endif
# 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
-
#ifdef TCPWRAP
# include <tcpd.h> /* for TCP Wrappers */
#endif
#include "array.h"
#include "defines.h"
-#include "resolve.h"
#include "exp.h"
#include "conn.h"
#include "imp.h"
#include "ngircd.h"
+#include "array.h"
#include "client.h"
+#include "class.h"
#include "conf.h"
+#include "conn-encoding.h"
+#include "conn-ssl.h"
#include "conn-zip.h"
#include "conn-func.h"
#include "log.h"
+#include "ng_ipaddr.h"
#include "parse.h"
+#include "resolve.h"
#include "tool.h"
-#ifdef ZEROCONF
-# include "rendezvous.h"
-#endif
-
#include "exp.h"
#define SERVER_WAIT (NONE - 1)
+#define MAX_COMMANDS 3
+#define MAX_COMMANDS_SERVER_MIN 10
+#define MAX_COMMANDS_SERVICE 10
+
+
+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, bool IsSSL ));
+static CONN_ID Socket2Index PARAMS(( int Sock ));
+static void Read_Request PARAMS(( CONN_ID Idx ));
+static unsigned int 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 void Account_Connection PARAMS((void));
-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 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 Simple_Message PARAMS(( int Sock, char *Msg ));
-LOCAL int Count_Connections PARAMS(( struct sockaddr_in addr ));
-LOCAL int NewListener PARAMS(( const UINT16 Port ));
static array My_Listeners;
+static array My_ConnArray;
+static size_t NumConnections, NumConnectionsMax, NumConnectionsAccepted;
#ifdef TCPWRAP
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));
+
+/**
+ * IO callback for listening sockets: handle new connections. This callback
+ * gets called when a new non-SSL connection should be accepted.
+ *
+ * @param sock Socket descriptor.
+ * @param irrelevant (ignored IO specification)
+ */
static void
cb_listen(int sock, short irrelevant)
{
(void) irrelevant;
- New_Connection( sock );
+ (void) New_Connection(sock, false);
+}
+
+
+#ifdef SSL_SUPPORT
+/**
+ * IO callback for listening SSL sockets: handle new connections. This callback
+ * gets called when a new SSL-enabled connection should be accepted.
+ *
+ * @param sock Socket descriptor.
+ * @param irrelevant (ignored IO specification)
+ */
+static void
+cb_listen_ssl(int sock, short irrelevant)
+{
+ int fd;
+
+ (void) irrelevant;
+ fd = New_Connection(sock, true);
+ if (fd < 0)
+ return;
+ io_event_setcb(My_Connections[fd].sock, cb_clientserver_ssl);
}
+#endif
+/**
+ * IO callback for new outgoing non-SSL server connections.
+ *
+ * @param sock Socket descriptor.
+ * @param what IO specification (IO_WANTREAD/IO_WANTWRITE/...).
+ */
static void
-cb_connserver(int sock, short what)
+cb_connserver(int sock, UNUSED short what)
{
- int res, err;
+ int res, err, server;
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
+ LogDebug("cb_connserver wants to write on unknown socket?!");
io_close(sock);
return;
}
- assert( what & IO_WANTWRITE);
+ assert(what & IO_WANTWRITE);
+
+ /* Make sure that the server is still configured; it could have been
+ * removed in the meantime! */
+ server = Conf_GetServer(idx);
+ if (server < 0) {
+ Log(LOG_ERR, "Connection on socket %d to \"%s\" aborted!",
+ sock, My_Connections[idx].host);
+ Conn_Close(idx, "Connection aborted!", NULL, false);
+ return;
+ }
/* 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;
+ sock_len = (socklen_t)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[server].port,
+ idx, strerror(err));
+
+ Conn_Close(idx, "Can't connect", NULL, false);
+
+ if (ng_ipaddr_af(&Conf_Server[server].dst_addr[0])) {
+ /* more addresses to try... */
+ New_Server(server, &Conf_Server[server].dst_addr[0]);
+ /* connection to dst_addr[0] is now in progress, so
+ * remove this address... */
+ Conf_Server[server].dst_addr[0] =
+ Conf_Server[server].dst_addr[1];
+ memset(&Conf_Server[server].dst_addr[1], 0,
+ sizeof(Conf_Server[server].dst_addr[1]));
+ }
+ return;
}
+ /* connect() succeeded, remove all additional addresses */
+ memset(&Conf_Server[server].dst_addr, 0,
+ sizeof(Conf_Server[server].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);
+}
- Log( LOG_INFO, "Connection %d with \"%s:%d\" established. Now logging in ...", idx,
- My_Connections[idx].host, Conf_Server[Conf_GetServer( idx )].port );
+
+/**
+ * Login to a remote server.
+ *
+ * @param idx Connection index.
+ */
+static void
+server_login(CONN_ID idx)
+{
+ Log(LOG_INFO,
+ "Connection %d (socket %d) with \"%s:%d\" established. Now logging in ...",
+ idx, My_Connections[idx].sock, 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);
}
+#ifdef SSL_SUPPORT
+/**
+ * IO callback for new outgoing SSL-enabled server connections.
+ *
+ * @param sock Socket descriptor.
+ * @param unused (ignored IO specification)
+ */
static void
-cb_clientserver(int sock, short what)
+cb_connserver_login_ssl(int sock, short unused)
{
- CONN_ID idx = Socket2Index( sock );
- if (idx <= NONE) {
-#ifdef DEBUG
- Log(LOG_WARNING, "WTF: cb_clientserver wants to write on unknown socket?!");
-#endif
+ 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_ERR, "SSL connection on socket %d failed!", sock);
+ Conn_Close(idx, "Can't connect", NULL, false);
+ return;
+ }
- if (what & IO_WANTREAD)
- Read_Request( idx );
+ 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
+
+
+/**
+ * IO callback for established non-SSL client and server connections.
+ *
+ * @param sock Socket descriptor.
+ * @param what IO specification (IO_WANTREAD/IO_WANTWRITE/...).
+ */
+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))) {
+ /* if TLS layer needs to write additional data, call
+ * Read_Request() instead so that SSL/TLS can continue */
+ Read_Request(idx);
+ }
+#else
+ if (what & IO_WANTREAD)
+ Read_Request(idx);
+#endif
if (what & IO_WANTWRITE)
- Handle_Write( idx );
+ Handle_Write(idx);
}
-LOCAL void
-FreeRes_stat( CONNECTION *c )
+#ifdef SSL_SUPPORT
+/**
+ * IO callback for established SSL-enabled client and server connections.
+ *
+ * @param sock Socket descriptor.
+ * @param what IO specification (IO_WANTREAD/IO_WANTWRITE/...).
+ */
+static void
+cb_clientserver_ssl(int sock, short what)
{
- assert( c != NULL );
- assert( c->res_stat != NULL );
+ CONN_ID idx = Socket2Index(sock);
+
+ assert(idx >= 0);
+
+ if (idx < 0) {
+ io_close(sock);
+ return;
+ }
- if (!c->res_stat) return;
+ switch (ConnSSL_Accept(&My_Connections[idx])) {
+ case 1:
+ break; /* OK */
+ case 0:
+ return; /* EAGAIN: callback will be invoked again by IO layer */
+ default:
+ Conn_Close(idx, "SSL accept error, closing socket", "SSL accept error", false);
+ return;
+ }
+ if (what & IO_WANTREAD)
+ Read_Request(idx);
- io_close( c->res_stat->pipe[0] );
+ if (what & IO_WANTWRITE)
+ Handle_Write(idx);
- free( c->res_stat );
- c->res_stat = NULL;
+ io_event_setcb(sock, cb_clientserver); /* SSL handshake completed */
}
+#endif
+/**
+ * Initialize connecion module.
+ */
GLOBAL void
Conn_Init( void )
{
- /* Modul initialisieren: statische Strukturen "ausnullen". */
-
CONN_ID i;
/* Speicher fuer Verbindungs-Pool anfordern */
Pool_Size = CONNECTION_POOL;
- if( Conf_MaxConnections > 0 )
- {
- /* konfiguriertes Limit beachten */
- if( Pool_Size > Conf_MaxConnections ) Pool_Size = Conf_MaxConnections;
- }
- My_Connections = (CONNECTION *) calloc( Pool_Size, sizeof( CONNECTION ) );
- if( ! My_Connections )
- {
- /* Speicher konnte nicht alloziert werden! */
- Log( LOG_EMERG, "Can't allocate memory! [Conn_Init]" );
- exit( 1 );
+ 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
- array_free( &My_Listeners );
+ /* FIXME: My_Connetions/Pool_Size is needed by other parts of the
+ * code; remove them! */
+ My_Connections = (CONNECTION*) array_start(&My_ConnArray);
- /* Groesster File-Descriptor fuer select() */
- Conn_MaxFD = 0;
+ LogDebug("Allocated connection pool for %d items (%ld bytes).",
+ array_length(&My_ConnArray, sizeof(CONNECTION)),
+ array_bytes(&My_ConnArray));
- /* Connection-Struktur initialisieren */
- for( i = 0; i < Pool_Size; i++ ) Init_Conn_Struct( i );
+ assert(array_length(&My_ConnArray, sizeof(CONNECTION)) >= (size_t)Pool_Size);
+
+ array_free( &My_Listeners );
- /* Global write counter */
- WCounter = 0;
+ for (i = 0; i < Pool_Size; i++)
+ Init_Conn_Struct(i);
} /* Conn_Init */
+/**
+ * Clean up connection module.
+ */
GLOBAL void
Conn_Exit( void )
{
- /* Modul abmelden: alle noch offenen Connections
- * schliessen und freigeben. */
-
CONN_ID idx;
-#ifdef DEBUG
- Log( LOG_DEBUG, "Shutting down all connections ..." );
-#endif
-
Conn_ExitListeners();
- /* Sockets schliessen */
+ LogDebug("Shutting down all connections ..." );
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 );
+ array_free(&My_ConnArray);
My_Connections = NULL;
Pool_Size = 0;
io_library_shutdown();
} /* Conn_Exit */
-GLOBAL int
-Conn_InitListeners( void )
+/**
+ * Close all sockets (file descriptors) of open connections.
+ * This is useful in forked child processes, for example, to make sure that
+ * they don't hold connections open that the main process wants to close.
+ */
+GLOBAL void
+Conn_CloseAllSockets(int ExceptOf)
{
- /* Initialize ports on which the server should accept connections */
-
- int created, fd;
- unsigned int i;
+ CONN_ID idx;
- if (!io_library_init(CONNECTION_POOL)) {
- Log(LOG_EMERG, "Cannot initialize IO routines: %s", strerror(errno));
- return -1;
+ for(idx = 0; idx < Pool_Size; idx++) {
+ if(My_Connections[idx].sock > NONE &&
+ My_Connections[idx].sock != ExceptOf)
+ close(My_Connections[idx].sock);
}
+}
- created = 0;
- for( i = 0; i < Conf_ListenPorts_Count; i++ ) {
- fd = NewListener( Conf_ListenPorts[i] );
+
+/**
+ * Initialize listening ports.
+ *
+ * @param a Array containing the ports the daemon should listen on.
+ * @param listen_addr Address the socket should listen on (can be "0.0.0.0").
+ * @param func IO callback function to register.
+ * @returns Number of listening sockets created.
+ */
+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) {
- Log( LOG_ERR, "Can't listen on port %u!", (unsigned int) Conf_ListenPorts[i] );
+ port++;
continue;
}
- if (!io_event_create( fd, IO_WANTREAD, cb_listen )) {
+ 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) Conf_ListenPorts[i], strerror(errno));
+ fd, (unsigned int) *port, strerror(errno));
close(fd);
+ port++;
continue;
}
created++;
+ port++;
+ }
+ return created;
+}
+
+
+/**
+ * Initialize all listening sockets.
+ *
+ * @returns Number of created listening sockets
+ */
+GLOBAL unsigned int
+Conn_InitListeners( void )
+{
+ /* Initialize ports on which the server should accept connections */
+ unsigned int created = 0;
+ char *copy, *listen_addr;
+
+ assert(Conf_ListenAddress);
+
+ /* 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 */
+/**
+ * Shut down all listening sockets.
+ */
GLOBAL void
Conn_ExitListeners( void )
{
/* Close down all listening sockets */
int *fd;
- unsigned int arraylen;
-#ifdef ZEROCONF
- Rendezvous_UnregisterListeners( );
-#endif
+ size_t arraylen;
arraylen = array_length(&My_Listeners, sizeof (int));
- Log( LOG_INFO, "Shutting down all listening sockets (%d)...", arraylen );
+ Log(LOG_INFO,
+ "Shutting down all listening sockets (%d total) ...", arraylen);
+ fd = array_start(&My_Listeners);
while(arraylen--) {
- fd = (int*) array_get(&My_Listeners, sizeof (int), arraylen);
- if (fd) {
- close(*fd);
-#ifdef DEBUG
- Log( LOG_DEBUG, "Listening socket %d closed.", *fd );
- } else {
- Log( LOG_DEBUG, "array_get pos %d returned NULL", arraylen );
-#endif
- }
+ assert(fd != NULL);
+ assert(*fd >= 0);
+ io_close(*fd);
+ LogDebug("Listening socket %d closed.", *fd );
+ fd++;
}
array_free(&My_Listeners);
} /* Conn_ExitListeners */
-/* return new listening port file descriptor or -1 on failure */
-LOCAL int
-NewListener( const UINT16 Port )
+/**
+ * Bind a socket to a specific (source) address.
+ *
+ * @param addr Address structure.
+ * @param listen_addrstr Source address as string.
+ * @param Port Port number.
+ * @returns true on success, false otherwise.
+ */
+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 ZEROCONF
- 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 )
+
+/**
+ * Set a socket to "IPv6 only". If the given socket doesn't belong to the
+ * AF_INET6 family, or the operating system doesn't support this functionality,
+ * this function retruns silently.
+ *
+ * @param af Address family of the socket.
+ * @param sock Socket handle.
+ */
+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, (socklen_t)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 -1;
- }
- }
- else inaddr.s_addr = htonl( INADDR_ANY );
- addr.sin_addr = inaddr;
+}
- /* Socket erzeugen */
- sock = socket( PF_INET, SOCK_STREAM, 0);
- if( sock < 0 )
- {
- Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
+
+/**
+ * Initialize new listening port.
+ *
+ * @param listen_addr Local address to bind the socet to (can be 0.0.0.0).
+ * @param Port Port number on which the new socket should be listening.
+ * @returns file descriptor of the socket 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;
+
+ 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 -1;
+ 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 );
+ 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 ));
- close( sock );
+ if (listen(sock, 10) != 0) {
+ Log(LOG_CRIT, "Can't listen on socket: %s!", strerror(errno));
+ close(sock);
return -1;
}
- /* Neuen Listener in Strukturen einfuegen */
- 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 );
+ /* 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);
+ return sock;
+} /* NewListener */
-#ifdef ZEROCONF
- /* Get best server description text */
- if( ! Conf_ServerInfo[0] ) info = Conf_ServerName;
- else
- {
- /* Use server info string */
- info = NULL;
- if( Conf_ServerInfo[0] == '[' )
- {
- /* Cut off leading hostname part in "[]" */
- info = strchr( Conf_ServerInfo, ']' );
- if( info )
- {
- info++;
- while( *info == ' ' ) info++;
- }
- }
- if( ! info ) info = Conf_ServerInfo;
+
+#ifdef SSL_SUPPORT
+
+/**
+ * Check if SSL library needs to read SSL-protocol related data.
+ *
+ * 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).
+ *
+ * @param c Connection to check.
+ * @returns true if SSL-library has to read protocol data.
+ */
+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;
+}
+
+/**
+ * Check if SSL library needs to write SSL-protocol related data.
+ *
+ * Please see description of SSL_WantRead() for full description!
+ *
+ * @param c Connection to check.
+ * @returns true if SSL-library has to write protocol data.
+ */
+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;
+}
- /* 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 ));
+#else
+
+static inline bool
+SSL_WantRead(UNUSED const CONNECTION *c)
+{ return false; }
+
+static inline bool
+SSL_WantWrite(UNUSED const CONNECTION *c)
+{ return false; }
- /* Register service */
- Rendezvous_Register( name, MDNS_TYPE, Port );
#endif
- return sock;
-} /* NewListener */
+/**
+ * "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 )
+Conn_Handler(void)
{
- /* "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
- */
int i;
- unsigned int wdatalen;
+ unsigned int wdatalen, bytes_processed;
struct timeval tv;
- time_t start, t;
- bool timeout;
-
- start = time( NULL );
- while(( ! NGIRCd_SignalQuit ) && ( ! NGIRCd_SignalRestart ))
- {
- timeout = true;
-
-#ifdef ZEROCONF
- Rendezvous_Handler( );
-#endif
+ time_t t;
- /* Should the configuration be reloaded? */
- if( NGIRCd_SignalRehash ) NGIRCd_Rehash( );
+ while (!NGIRCd_SignalQuit && !NGIRCd_SignalRestart) {
+ t = time(NULL);
/* 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 ) && ( 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;
+ Check_Servers();
+ Check_Connections();
+
+ /* Expire outdated class/list items */
+ Class_Expire();
+
+ /* 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 */
+ bytes_processed = Handle_Buffer(i);
+ /* if we processed data, and there might be
+ * more commands in the input buffer, do not
+ * try to read any more data now */
+ if (bytes_processed &&
+ array_bytes(&My_Connections[i].rbuf) > 2) {
+ LogDebug
+ ("Throttling connection %d: command limit reached!",
+ i);
+ Conn_SetPenalty(i, 1);
+ }
}
}
- /* noch volle Schreib-Puffer suchen */
- for( i = 0; i < Pool_Size; i++ ) {
- if ( My_Connections[i].sock <= NONE )
+ /* Look for non-empty write buffers ... */
+ for (i = 0; i < Pool_Size; i++) {
+ if (My_Connections[i].sock <= NONE)
continue;
- wdatalen = array_bytes(&My_Connections[i].wbuf);
-
+ wdatalen = (unsigned int)array_bytes(&My_Connections[i].wbuf);
#ifdef ZLIB
- if (( wdatalen > 0 ) || ( array_bytes(&My_Connections[i].zip.wbuf)> 0 ))
+ if (wdatalen > 0 ||
+ array_bytes(&My_Connections[i].zip.wbuf) > 0)
#else
- if ( wdatalen > 0 )
+ if (wdatalen > 0)
#endif
{
- /* Socket der Verbindung in Set aufnehmen */
- io_event_add( My_Connections[i].sock, IO_WANTWRITE );
+ if (SSL_WantRead(&My_Connections[i]))
+ continue;
+ io_event_add(My_Connections[i].sock,
+ IO_WANTWRITE);
}
}
- /* von welchen Sockets koennte gelesen werden? */
- for (i = 0; i < Pool_Size; i++ ) {
- if ( My_Connections[i].sock <= NONE )
+ /* Check from which sockets we possibly could read ... */
+ 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 );
+#ifdef SSL_SUPPORT
+ if (SSL_WantWrite(&My_Connections[i]))
+ continue; /* TLS/SSL layer needs to write data; deal with this first */
+#endif
+ if (Proc_InProgress(&My_Connections[i].proc_stat)) {
+ /* Wait for completion of forked subprocess
+ * and ignore the socket in the meantime ... */
+ io_event_del(My_Connections[i].sock,
+ IO_WANTREAD);
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() ... */
+ continue;
- if( My_Connections[i].delaytime > t ) {
- /* Fuer die Verbindung ist eine "Penalty-Zeit" gesetzt */
- io_event_del( My_Connections[i].sock, IO_WANTREAD );
+ 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 );
+
+ io_event_add(My_Connections[i].sock, IO_WANTREAD);
}
- /* Timeout initialisieren */
+ /* 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;
- if( timeout ) tv.tv_sec = 1;
- else tv.tv_sec = 0;
-
- /* Auf Aktivitaet warten */
- i = io_dispatch( &tv );
- if (i == -1 && errno != EINTR ) {
- Log(LOG_EMERG, "Conn_Handler(): io_dispatch(): %s!", strerror(errno));
- Log(LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME);
- exit( 1 );
+ 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.
+ *
+ * @param Idx Index fo the connection.
+ * @param Format Format string, see printf().
+ * @returns true on success, false otherwise.
*/
#ifdef PROTOTYPES
GLOBAL bool
-Conn_WriteStr( CONN_ID Idx, char *Format, ... )
+Conn_WriteStr(CONN_ID Idx, const char *Format, ...)
#else
GLOBAL bool
-Conn_WriteStr( Idx, Format, va_alist )
+Conn_WriteStr(Idx, Format, va_alist)
CONN_ID Idx;
-char *Format;
+const char *Format;
va_dcl
#endif
{
char buffer[COMMAND_LEN];
+#ifdef ICONV
+ char *ptr, *message;
+#endif
+ size_t len;
bool ok;
va_list ap;
CUT_TXTSUFFIX);
}
+#ifdef ICONV
+ ptr = strchr(buffer + 1, ':');
+ if (ptr) {
+ ptr++;
+ message = Conn_EncodingTo(Idx, ptr);
+ if (message != ptr)
+ strlcpy(ptr, message, sizeof(buffer) - (ptr - buffer));
+ }
+#endif
+
#ifdef SNIFFER
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 );
return ok;
} /* Conn_WriteStr */
-
-GLOBAL bool
-Conn_Write( CONN_ID Idx, char *Data, unsigned int Len )
+GLOBAL char*
+Conn_Password( CONN_ID Idx )
+{
+ assert( Idx > NONE );
+ if (My_Connections[Idx].pwd == NULL)
+ return (char*)"\0";
+ else
+ return My_Connections[Idx].pwd;
+} /* Conn_Password */
+
+GLOBAL void
+Conn_SetPassword( CONN_ID Idx, const char *Pwd )
{
- /* Daten in Socket schreiben. Bei "fatalen" Fehlern wird
- * der Client disconnectiert und false geliefert. */
+ assert( Idx > NONE );
+
+ if (My_Connections[Idx].pwd)
+ free(My_Connections[Idx].pwd);
+ My_Connections[Idx].pwd = strdup(Pwd);
+ if (My_Connections[Idx].pwd == NULL) {
+ Log(LOG_EMERG, "Can't allocate memory! [Conn_SetPassword]");
+ exit(1);
+ }
+} /* Conn_SetPassword */
+
+/**
+ * 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.
+ * @returns true on success, false otherwise.
+ */
+static bool
+Conn_Write( CONN_ID Idx, char *Data, size_t Len )
+{
+ CLIENT *c;
+ size_t writebuf_limit = WRITEBUFFER_MAX_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
+ /* 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;
}
- /* 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( 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( ! Handle_Write( Idx )) return false;
-
- /* 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;
- }
- }
+ /* Make sure that there still exists a CLIENT structure associated
+ * with this connection and check if this is a server or not: */
+ c = Conn_GetClient(Idx);
+ if (c) {
+ /* 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;
+ } else
+ LogDebug("Write on socket without client (connection %d)!?", Idx);
#ifdef ZLIB
if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) {
- /* Daten komprimieren und in Puffer kopieren */
- if( ! Zip_Buffer( Idx, Data, Len )) return false;
+ /* 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 */
- if (!array_catb( &My_Connections[Idx].wbuf, Data, Len ))
+ /* Uncompressed link:
+ * Check if outbound buffer has enough space for the data. */
+ if (array_bytes(&My_Connections[Idx].wbuf) + Len >=
+ WRITEBUFFER_FLUSH_LEN) {
+ /* 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 space exhausted (connection %d, limit is %lu bytes, %lu bytes new, %lu bytes pending)",
+ Idx, writebuf_limit, Len,
+ (unsigned long)array_bytes(&My_Connections[Idx].wbuf));
+ Conn_Close(Idx, "Write buffer space exhausted", 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;
} /* Conn_Write */
+/**
+ * Shut down a connection.
+ *
+ * @param Idx Connection index.
+ * @param LogMsg Message to write to the log or NULL. If no LogMsg
+ * is given, the FwdMsg is logged.
+ * @param FwdMsg Message to forward to remote servers.
+ * @param InformClient If true, inform the client on the connection which is
+ * to be shut down of the reason (FwdMsg) and send
+ * connection statistics before disconnecting it.
+ */
GLOBAL void
-Conn_Close( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient )
+Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClient )
{
- /* Close connection. Open pipes of asyncronous resolver
+ /* Close connection. Open pipes of asynchronous resolver
* sub-processes are closed down. */
CLIENT *c;
- char *txt;
double in_k, out_k;
+ UINT16 port;
#ifdef ZLIB
double in_z_k, out_z_k;
int in_p, out_p;
if( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ISCLOSING )) {
/* Conn_Close() has been called recursively for this link;
* probabe reason: Handle_Write() failed -- see below. */
-#ifdef DEBUG
- Log( LOG_DEBUG, "Recursive request to close connection: %d", Idx );
-#endif
+ LogDebug("Recursive request to close connection: %d", Idx );
return;
}
/* Mark link as "closing" */
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." );
+ /* Send ERROR to client (see RFC 2812, section 3.1.7) */
+ if (FwdMsg)
+ Conn_WriteStr(Idx, "ERROR :%s", FwdMsg);
+ else
+ Conn_WriteStr(Idx, "ERROR :Closing connection");
}
- /* Try to write out the write buffer */
+ /* 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( ! io_close( My_Connections[Idx].sock ))
- {
+ 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 ));
+ 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: */
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;
#ifdef ZLIB
- if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) {
+ 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, ntohs( My_Connections[Idx].addr.sin_port ), in_k, in_z_k, in_p, out_k, out_z_k, out_p );
+ 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 )
- FreeRes_stat( &My_Connections[Idx] );
-
/* Servers: Modify time of next connect attempt? */
Conf_UnsetServer( Idx );
array_free(&My_Connections[Idx].rbuf);
array_free(&My_Connections[Idx].wbuf);
+ if (My_Connections[Idx].pwd != NULL)
+ free(My_Connections[Idx].pwd);
+
/* 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 )
+/**
+ * Get current number of connections.
+ *
+ * @returns Number of current connections.
+ */
+GLOBAL long
+Conn_Count(void)
+{
+ return NumConnections;
+} /* Conn_Count */
+
+
+/**
+ * Get number of maximum simultaneous connections.
+ *
+ * @returns Number of maximum simultaneous connections.
+ */
+GLOBAL long
+Conn_CountMax(void)
{
- /* Synchronize server structures (connection IDs):
- * connections <-> configuration */
+ return NumConnectionsMax;
+} /* Conn_CountMax */
+
+/**
+ * Get number of connections accepted since the daemon startet.
+ *
+ * @returns Number of connections accepted.
+ */
+GLOBAL long
+Conn_CountAccepted(void)
+{
+ return NumConnectionsAccepted;
+} /* Conn_CountAccepted */
+
+
+/**
+ * Synchronize established connections and configured server structures
+ * after a configuration update and store the correct connection IDs, if any.
+ */
+GLOBAL void
+Conn_SyncServerStruct(void)
+{
CLIENT *client;
CONN_ID i;
int c;
- for( i = 0; i < Pool_Size; i++ )
- {
- /* Established connection? */
- if( My_Connections[i].sock <= NONE ) continue;
+ for (i = 0; i < Pool_Size; i++) {
+ if (My_Connections[i].sock == NONE)
+ continue;
- /* Server connection? */
- client = Client_GetFromConn( i );
- if(( ! client ) || ( Client_Type( client ) != CLIENT_SERVER )) continue;
+ /* Server link? */
+ client = Conn_GetClient(i);
+ if (!client || Client_Type(client) != CLIENT_SERVER)
+ continue;
- for( c = 0; c < MAX_SERVERS; c++ )
- {
+ for (c = 0; c < MAX_SERVERS; c++) {
/* Configured server? */
- if( ! Conf_Server[c].host[0] ) continue;
+ 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 (strcasecmp(Conf_Server[c].name, Client_ID(client)) == 0)
+ Conf_Server[c].conn_id = i;
}
}
} /* SyncServerStruct */
-LOCAL bool
-Handle_Write( CONN_ID Idx )
+/**
+ * Get IP address string of a connection.
+ *
+ * @param Idx Connection index.
+ * @return Pointer to a global buffer containing the IP address as string.
+ */
+GLOBAL const char *
+Conn_GetIPAInfo(CONN_ID Idx)
{
- /* Daten aus Schreibpuffer versenden bzw. Connection aufbauen */
+ assert(Idx > NONE);
+ return ng_ipaddr_tostr(&My_Connections[Idx].addr);
+}
+
- int len;
- unsigned int wdatalen;
+/**
+ * Send out data of write buffer; connect new sockets.
+ *
+ * @param Idx Connection index.
+ * @returns true on success, false otherwise.
+ */
+static bool
+Handle_Write( CONN_ID Idx )
+{
+ ssize_t len;
+ size_t 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);
+ LogDebug("Handle_Write() on closed socket, connection %d", Idx);
return false;
}
assert( My_Connections[Idx].sock > NONE );
-
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;
+ 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
- /* write buffer empty, but not compression buf? -> flush compression buf. */
- if( wdatalen == 0 ) Zip_Flush( Idx );
-#else
- if( wdatalen == 0 ) {
+ if (wdatalen == 0) {
+ /* Still no data, fine. */
io_event_del(My_Connections[Idx].sock, IO_WANTWRITE );
return true;
}
+
+#ifdef DEBUG_BUFFER
+ LogDebug
+ ("Handle_Write() called for connection %d, %ld bytes pending ...",
+ Idx, wdatalen);
#endif
- 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 );
+#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
+ {
+ len = write(My_Connections[Idx].sock,
+ array_start(&My_Connections[Idx].wbuf), wdatalen );
+ }
if( len < 0 ) {
- if( errno == EAGAIN || errno == EINTR)
+ 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 );
+ 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;
}
/* move any data not yet written to beginning */
- array_moveleft(&My_Connections[Idx].wbuf, 1, len);
+ array_moveleft(&My_Connections[Idx].wbuf, 1, (size_t)len);
return true;
} /* Handle_Write */
-LOCAL void
-New_Connection( int Sock )
+/**
+ * Count established connections to a specific IP address.
+ *
+ * @returns Number of established connections.
+ */
+static int
+Count_Connections(ng_ipaddr_t *a)
{
- /* Neue Client-Verbindung von Listen-Socket annehmen und
- * CLIENT-Struktur anlegen. */
+ int i, cnt;
+
+ 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++;
+ }
+ return cnt;
+} /* Count_Connections */
+
+/**
+ * Initialize new client connection on a listening socket.
+ *
+ * @param Sock Listening socket descriptor.
+ * @param IsSSL true if this socket expects SSL-encrypted data.
+ * @returns Accepted socket descriptor or -1 on error.
+ */
+static int
+New_Connection(int Sock, UNUSED bool IsSSL)
+{
#ifdef TCPWRAP
struct request_info req;
#endif
- struct sockaddr_in new_addr;
+ ng_ipaddr_t new_addr;
+ char ip_str[NG_INET_ADDRSTRLEN];
int new_sock, new_sock_len;
- RES_STAT *s;
- CONN_ID idx;
CLIENT *c;
- POINTER *ptr;
- long new_size, cnt;
-
- assert( Sock > NONE );
- /* Connection auf Listen-Socket annehmen */
- new_sock_len = sizeof( new_addr );
- new_sock = accept( Sock, (struct sockaddr *)&new_addr, (socklen_t *)&new_sock_len );
- if( new_sock < 0 )
- {
- Log( LOG_CRIT, "Can't accept connection: %s!", strerror( errno ));
- return;
+ long cnt;
+
+ assert(Sock > NONE);
+
+ LogDebug("Accepting new connection on socket %d ...", Sock);
+
+ 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;
+ }
+ NumConnectionsAccepted++;
+
+ 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 );
+ request_init(&req, RQ_DAEMON, PACKAGE_NAME, RQ_FILE, new_sock,
+ RQ_CLIENT_SIN, &new_addr, NULL);
fromhost(&req);
- if( ! hosts_access( &req ))
- {
- /* Access denied! */
- Log( deny_severity, "Refused connection from %s (by TCP Wrappers)!", inet_ntoa( new_addr.sin_addr ));
- Simple_Message( new_sock, "ERROR :Connection refused" );
- close( new_sock );
- return;
+ 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 -1;
}
#endif
- /* Socket initialisieren */
- Init_Socket( new_sock );
-
+ if (!Init_Socket(new_sock))
+ return -1;
+
+ /* Check global connection limit */
+ if ((Conf_MaxConnections > 0) &&
+ (NumConnections >= (size_t) Conf_MaxConnections)) {
+ 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;
+ }
+
/* 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);
- Simple_Message( new_sock, "ERROR :Connection refused, too many connections from your IP address!" );
- close( new_sock );
- return;
+ 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 -1;
}
- /* Freie Connection-Struktur suchen */
- for( idx = 0; idx < Pool_Size; idx++ ) if( My_Connections[idx].sock == NONE ) break;
- if( idx >= Pool_Size )
- {
- new_size = Pool_Size + CONNECTION_POOL;
-
- /* Im bisherigen Pool wurde keine freie Connection-Struktur mehr gefunden.
- * Wenn erlaubt und moeglich muss nun der Pool vergroessert werden: */
-
- if( Conf_MaxConnections > 0 )
- {
- /* Es ist ein Limit konfiguriert */
- 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 accept connection: limit (%d) reached -- overflow!", Pool_Size );
- Simple_Message( new_sock, "ERROR :Connection limit reached" );
- close( new_sock );
- return;
- }
-
- ptr = (POINTER *)realloc( My_Connections, sizeof( CONNECTION ) * new_size );
- if( ! ptr ) {
- Log( LOG_EMERG, "Can't allocate memory! [New_Connection]" );
- Simple_Message( new_sock, "ERROR: Internal error" );
- close( new_sock );
- return;
+ 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 -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;
+ My_Connections = array_start(&My_ConnArray);
+ while (Pool_Size <= new_sock)
+ Init_Conn_Struct(Pool_Size++);
+ }
- /* Adjust new pool size */
- Pool_Size = new_size;
+ /* 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;
}
- /* 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;
+ c = Client_NewLocal(new_sock, NULL, 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;
}
- /* Verbindung registrieren */
- Init_Conn_Struct( idx );
- My_Connections[idx].sock = new_sock;
- My_Connections[idx].addr = new_addr;
+ 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;
- /* Neuen Socket registrieren */
- 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;
- }
+ /* Set initial hostname to IP address. This becomes overwritten when
+ * the DNS lookup is enabled and succeeds, but is used otherwise. */
+ if (ng_ipaddr_af(&new_addr) != AF_INET)
+ snprintf(My_Connections[new_sock].host,
+ sizeof(My_Connections[new_sock].host), "[%s]", ip_str);
+ else
+ strlcpy(My_Connections[new_sock].host, ip_str,
+ sizeof(My_Connections[new_sock].host));
- 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 );
+ Client_SetHostname(c, My_Connections[new_sock].host);
- /* Hostnamen ermitteln */
- strlcpy( My_Connections[idx].host, inet_ntoa( new_addr.sin_addr ), sizeof( My_Connections[idx].host ));
- Client_SetHostname( c, My_Connections[idx].host );
-#ifdef IDENTAUTH
- s = Resolve_Addr( &new_addr, My_Connections[idx].sock );
-#else
- s = Resolve_Addr( &new_addr );
+ Log(LOG_INFO, "Accepted connection %d from \"%s:%d\" on socket %d.",
+ new_sock, My_Connections[new_sock].host,
+ ng_ipaddr_getport(&new_addr), Sock);
+ Account_Connection();
+
+#ifdef SSL_SUPPORT
+ /* Delay connection initalization until SSL handshake is finished */
+ if (!IsSSL)
#endif
- /* resolver process has been started */
- if( s ) My_Connections[idx].res_stat = s;
+ Conn_StartLogin(new_sock);
- /* Penalty-Zeit setzen */
- Conn_SetPenalty( idx, 4 );
+ return new_sock;
} /* New_Connection */
-LOCAL CONN_ID
-Socket2Index( int Sock )
+/**
+ * Finish connection initialization, start resolver subprocess.
+ *
+ * @param Idx Connection index.
+ */
+GLOBAL void
+Conn_StartLogin(CONN_ID Idx)
{
- /* zum Socket passende Connection suchen */
+ int ident_sock = -1;
- CONN_ID idx;
+ assert(Idx >= 0);
- assert( Sock > NONE );
+ /* Nothing to do if DNS (and resolver subprocess) is disabled */
+ if (!Conf_DNS)
+ return;
- for( idx = 0; idx < Pool_Size; idx++ ) if( My_Connections[idx].sock == Sock ) break;
+#ifdef IDENTAUTH
+ /* Should we make an IDENT request? */
+ if (Conf_Ident)
+ ident_sock = My_Connections[Idx].sock;
+#endif
- if( idx >= Pool_Size )
- {
- /* die Connection wurde vermutlich (wegen eines
- * Fehlers) bereits wieder abgebaut ... */
-#ifdef DEBUG
- Log( LOG_DEBUG, "Socket2Index: can't get connection for socket %d!", Sock );
+ if (Conf_NoticeAuth) {
+ /* Send "NOTICE AUTH" messages to the client */
+#ifdef IDENTAUTH
+ if (Conf_Ident)
+ (void)Conn_WriteStr(Idx,
+ "NOTICE AUTH :*** Looking up your hostname and checking ident");
+ else
#endif
+ (void)Conn_WriteStr(Idx,
+ "NOTICE AUTH :*** Looking up your hostname");
+ (void)Handle_Write(Idx);
+ }
+
+ Resolve_Addr(&My_Connections[Idx].proc_stat, &My_Connections[Idx].addr,
+ ident_sock, cb_Read_Resolver_Result);
+}
+
+
+/**
+ * Update global connection counters.
+ */
+static void
+Account_Connection(void)
+{
+ NumConnections++;
+ if (NumConnections > NumConnectionsMax)
+ NumConnectionsMax = NumConnections;
+ LogDebug("Total number of connections now %lu (max %lu).",
+ NumConnections, NumConnectionsMax);
+} /* Account_Connection */
+
+
+/**
+ * Translate socket handle into connection index.
+ *
+ * @param Sock Socket handle.
+ * @returns Connecion index or NONE, if no connection could be found.
+ */
+static CONN_ID
+Socket2Index( int Sock )
+{
+ assert( Sock >= 0 );
+
+ if( Sock >= Pool_Size || My_Connections[Sock].sock != Sock ) {
+ /* the Connection was already closed again, likely due to
+ * an error. */
+ 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.
+ *
+ * @param Idx Connection index.
+ */
+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;
- char readbuf[1024];
-
+ ssize_t len;
+ static const unsigned int maxbps = COMMAND_LEN / 2;
+ char readbuf[READBUFFER_LEN];
+ time_t t;
+ CLIENT *c;
assert( Idx > NONE );
assert( My_Connections[Idx].sock > NONE );
#ifdef ZLIB
- if (( array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN ) ||
- ( array_bytes(&My_Connections[Idx].zip.rbuf) >= ZREADBUFFER_LEN ))
+ if ((array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN) ||
+ (array_bytes(&My_Connections[Idx].zip.rbuf) >= READBUFFER_LEN))
#else
- if ( array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN )
+ 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,
- array_bytes(&My_Connections[Idx].rbuf));
- Conn_Close( Idx, "Receive buffer overflow!", NULL, false );
+ /* Read buffer is full */
+ Log(LOG_ERR,
+ "Receive buffer space exhausted (connection %d): %d bytes",
+ Idx, array_bytes(&My_Connections[Idx].rbuf));
+ Conn_Close(Idx, "Receive buffer space exhausted", NULL, false);
return;
}
- 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 );
+#ifdef SSL_SUPPORT
+ if (Conn_OPTION_ISSET(&My_Connections[Idx], CONN_SSL))
+ len = ConnSSL_Read( &My_Connections[Idx], readbuf, sizeof(readbuf));
+ else
+#endif
+ len = read(My_Connections[Idx].sock, readbuf, sizeof(readbuf));
+ if (len == 0) {
+ LogDebug("Client \"%s:%u\" is closing connection %d ...",
+ My_Connections[Idx].host,
+ ng_ipaddr_tostr(&My_Connections[Idx].addr), Idx);
+ Conn_Close(Idx, NULL, "Client closed connection", false);
return;
}
- if( len < 0 ) {
+ if (len < 0) {
if( errno == EAGAIN ) return;
- Log( LOG_ERR, "Read error on connection %d (socket %d): %s!", Idx,
- My_Connections[Idx].sock, strerror( errno ));
- Conn_Close( Idx, "Read error!", "Client closed connection", false );
+ Log(LOG_ERR, "Read error on connection %d (socket %d): %s!",
+ Idx, My_Connections[Idx].sock, strerror(errno));
+ Conn_Close(Idx, "Read error", "Client closed connection",
+ false);
return;
}
#ifdef ZLIB
- if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) {
- if (!array_catb( &My_Connections[Idx].zip.rbuf, readbuf, len)) {
- Log( LOG_ERR, "Could not append recieved data to zip input buffer (connn %d): %d bytes!", Idx, len );
- Conn_Close( Idx, "Receive buffer overflow!", NULL, false );
+ 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 received data to zip input buffer (connection %d): %d bytes!",
+ Idx, len);
+ Conn_Close(Idx, "Receive buffer space exhausted", 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 );
+ if (!array_catb( &My_Connections[Idx].rbuf, readbuf, len)) {
+ Log(LOG_ERR,
+ "Could not append received data to input buffer (connection %d): %d bytes!",
+ Idx, len);
+ Conn_Close(Idx, "Receive buffer space exhausted", NULL, false );
}
}
- /* Connection-Statistik aktualisieren */
+ /* Update connection statistics */
My_Connections[Idx].bytes_in += len;
+ My_Connections[Idx].bps += Handle_Buffer(Idx);
- /* Timestamp aktualisieren */
- My_Connections[Idx].lastdata = time( NULL );
+ /* Make sure that there is still a valid client registered */
+ c = Conn_GetClient(Idx);
+ if (!c)
+ return;
+
+ /* 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().
+ * Update "lastping", too, if time shifted backwards ... */
+ if (Client_Type(c) == CLIENT_USER
+ || Client_Type(c) == CLIENT_SERVER
+ || Client_Type(c) == CLIENT_SERVICE) {
+ t = time(NULL);
+ if (My_Connections[Idx].lastdata != t)
+ My_Connections[Idx].bps = 0;
+
+ My_Connections[Idx].lastdata = t;
+ if (My_Connections[Idx].lastping > t)
+ My_Connections[Idx].lastping = t;
+ }
- Handle_Buffer( Idx );
+ /* Look at the data in the (read-) buffer of this connection */
+ if (Client_Type(c) != CLIENT_SERVER
+ && Client_Type(c) != CLIENT_UNKNOWNSERVER
+ && Client_Type(c) != CLIENT_SERVICE
+ && My_Connections[Idx].bps >= maxbps) {
+ LogDebug("Throttling connection %d: BPS exceeded! (%u >= %u)",
+ Idx, My_Connections[Idx].bps, maxbps);
+ Conn_SetPenalty(Idx, 1);
+ }
} /* Read_Request */
-LOCAL bool
-Handle_Buffer( CONN_ID Idx )
+/**
+ * Handle all data in the connection read-buffer.
+ *
+ * Data is processed until no complete command is left in the read buffer,
+ * or MAX_COMMANDS[_SERVER|_SERVICE] commands were processed.
+ * When a fatal error occurs, the connection is shut down.
+ *
+ * @param Idx Index of the connection.
+ * @returns Number of bytes processed.
+ */
+static unsigned int
+Handle_Buffer(CONN_ID Idx)
{
- /* Handle Data in Connections Read-Buffer.
- * Return true if a reuqest was handled, false otherwise (also returned on errors). */
#ifndef STRICT_RFC
- char *ptr1, *ptr2;
+ char *ptr1, *ptr2, *first_eol;
#endif
char *ptr;
- int len, delta;
- unsigned int arraylen;
- bool action, result;
+ size_t len, delta;
+ time_t starttime;
#ifdef ZLIB
bool old_z;
#endif
+ unsigned int i, maxcmd = MAX_COMMANDS, len_processed = 0;
+ CLIENT *c;
+
+ c = Conn_GetClient(Idx);
+ starttime = time(NULL);
+
+ assert(c != NULL);
+
+ /* Servers get special command limits that depend on the user count */
+ switch (Client_Type(c)) {
+ case CLIENT_SERVER:
+ maxcmd = (int)(Client_UserCount() / 5)
+ + MAX_COMMANDS_SERVER_MIN;
+ /* Allow servers to handle even more commands while peering
+ * to speed up server login and network synchronisation. */
+ if (Conn_LastPing(Idx) == 0)
+ maxcmd *= 5;
+ break;
+ case CLIENT_SERVICE:
+ maxcmd = MAX_COMMANDS_SERVICE; break;
+ }
- result = false;
- do {
+ for (i=0; i < maxcmd; i++) {
/* Check penalty */
- if( My_Connections[Idx].delaytime > time( NULL )) return result;
+ if (My_Connections[Idx].delaytime > starttime)
+ return 0;
#ifdef ZLIB
- /* unpack compressed data */
- if ( Conn_OPTION_ISSET( &My_Connections[Idx], 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 0;
+ }
#endif
- arraylen = array_bytes(&My_Connections[Idx].rbuf);
- if (arraylen == 0)
+ if (0 == array_bytes(&My_Connections[Idx].rbuf))
break;
- if (!array_cat0(&My_Connections[Idx].rbuf)) /* make sure buf is NULL terminated */
- return false;
-
- array_truncate(&My_Connections[Idx].rbuf, 1, arraylen); /* do not count trailing NULL */
-
+ /* 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 0;
+ }
- /* A Complete Request end with CR+LF, see RFC 2812. */
- ptr = strstr( array_start(&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; /* complete request */
#ifndef STRICT_RFC
- 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' );
+ /* 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 )
+ if (!ptr)
break;
- /* End of request found */
+ /* Complete (=line terminated) request found, handle it! */
*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;
+ 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 0;
}
+ len_processed += (unsigned int)len;
+ 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);
+ continue;
+ }
#ifdef ZLIB
/* remember if stream is already compressed */
old_z = My_Connections[Idx].options & CONN_ZIP;
#endif
- if( len > delta )
- {
- /* A Request was read */
- My_Connections[Idx].msg_in++;
- if( ! Parse_Request( Idx, (char*)array_start(&My_Connections[Idx].rbuf) )) return false;
- else action = true;
+ My_Connections[Idx].msg_in++;
+ if (!Parse_Request
+ (Idx, (char *)array_start(&My_Connections[Idx].rbuf)))
+ return 0; /* error -> connection has been closed */
- array_moveleft(&My_Connections[Idx].rbuf, 1, len);
-#ifdef DEBUG
- Log(LOG_DEBUG, "%d byte left in rbuf", array_bytes(&My_Connections[Idx].rbuf));
+ array_moveleft(&My_Connections[Idx].rbuf, 1, len);
+#ifdef DEBUG_BUFFER
+ LogDebug("Connection %d: %d bytes left in read buffer.",
+ Idx, array_bytes(&My_Connections[Idx].rbuf));
#endif
- }
-
#ifdef ZLIB
- if(( ! old_z ) && ( My_Connections[Idx].options & CONN_ZIP ) && ( array_bytes(&My_Connections[Idx].rbuf) > 0 ))
- {
- /* The last Command activated Socket-Compression.
- * Data that was read after that needs to be copied to Unzip-buf
- * for decompression */
- if( array_bytes(&My_Connections[Idx].rbuf)> ZREADBUFFER_LEN ) {
- /* No space left */
- Log( LOG_ALERT, "Can't move receive buffer: No space left in unzip buffer (need %d bytes)!", array_bytes(&My_Connections[Idx].rbuf ));
- return false;
+ if ((!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 0;
}
- if (!array_copy( &My_Connections[Idx].zip.rbuf, &My_Connections[Idx].rbuf ))
- return false;
array_trunc(&My_Connections[Idx].rbuf);
-#ifdef DEBUG
- Log( LOG_DEBUG, "Moved already received data (%d bytes) to uncompression buffer.", array_bytes(&My_Connections[Idx].zip.rbuf));
-#endif /* DEBUG */
+ LogDebug
+ ("Moved already received data (%u bytes) to uncompression buffer.",
+ array_bytes(&My_Connections[Idx].zip.rbuf));
}
-#endif /* ZLIB */
- if( action ) result = true;
- } while( action );
-
- return result;
+#endif
+ }
+ return len_processed;
} /* Handle_Buffer */
-LOCAL void
-Check_Connections( void )
+/**
+ * Check whether established connections are still alive or not.
+ * If not, play PING-PONG first; and if that doesn't help either,
+ * disconnect the respective peer.
+ */
+static void
+Check_Connections(void)
{
- /* check if connections are alive. if not, play PING-PONG first.
- * if this doesn't help either, disconnect client. */
CLIENT *c;
CONN_ID i;
+ char msg[64];
- 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 )))
- {
+ 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 ) {
+ 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 );
+ snprintf(msg, sizeof(msg),
+ "Ping timeout: %d seconds",
+ Conf_PongTimeout);
+ LogDebug("Connection %d: %s.", i, msg);
+ Conn_Close(i, NULL, msg, true);
}
+ } else if (My_Connections[i].lastdata <
+ time(NULL) - Conf_PingTimeout) {
+ /* We need to send a PING ... */
+ LogDebug("Connection %d: sending PING ...", i);
+ Conn_UpdatePing(i);
+ Conn_WriteStr(i, "PING :%s",
+ Client_ID(Client_ThisServer()));
}
- else if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout ) {
- /* we need to sent a PING */
-#ifdef DEBUG
- Log( LOG_DEBUG, "Connection %d: sending PING ...", i );
-#endif
- My_Connections[i].lastping = time( NULL );
- Conn_WriteStr( i, "PING :%s", Client_ID( Client_ThisServer( )));
- }
- }
- else
- {
- /* connection is not fully established yet */
- if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout )
- {
- /* Timeout */
-#ifdef DEBUG
- Log( LOG_DEBUG, "Connection %d timed out ...", i );
-#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 )
+/**
+ * Check if further server links should be established.
+ */
+static void
+Check_Servers(void)
{
- /* Check if we can establish further server links */
-
- RES_STAT *s;
- CONN_ID idx;
int i, n;
+ time_t time_now;
- /* 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 );
- }
+ time_now = time(NULL);
/* Check all configured servers */
- for( i = 0; i < MAX_SERVERS; i++ )
- {
- /* Valid outgoing server which isn't already connected or disabled? */
- if(( ! Conf_Server[i].host[0] ) || ( ! Conf_Server[i].port > 0 ) || ( Conf_Server[i].conn_id > NONE ) || ( Conf_Server[i].flags & CONF_SFLAG_DISABLED )) continue;
+ for (i = 0; i < MAX_SERVERS; i++) {
+ if (Conf_Server[i].conn_id != NONE)
+ continue; /* Already establishing or connected */
+ if (!Conf_Server[i].host[0] || !Conf_Server[i].port > 0)
+ continue; /* No host and/or port configured */
+ if (Conf_Server[i].flags & CONF_SFLAG_DISABLED)
+ continue; /* Disabled configuration entry */
+ if (Conf_Server[i].lasttry > (time_now - Conf_ConnectRetry))
+ continue; /* We have to wait a little bit ... */
/* 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;
-
/* 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 );
-
- /* resolver process running? */
- if( s ) My_Connections[idx].res_stat = s;
+ Log(LOG_NOTICE,
+ "Preparing to establish a new server link for \"%s\" ...",
+ Conf_Server[i].name);
+ Conf_Server[i].lasttry = time_now;
+ Conf_Server[i].conn_id = SERVER_WAIT;
+ assert(Proc_GetPipeFd(&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 )
+/**
+ * Establish a new outgoing server connection.
+ *
+ * @param Server Configuration index of the server.
+ * @param dest Destination IP address to connect to.
+ */
+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: */
- Log( LOG_ERR, "Can't connect to \"%s\" (connection %d): ip address unknown!", Conf_Server[Server].host, Idx );
- goto out;
+ /* Make sure that the remote server hasn't re-linked to this server
+ * asynchronously on its own */
+ if (Conf_Server[Server].conn_id > NONE) {
+ Log(LOG_INFO,
+ "Connection to \"%s\" meanwhile re-established, aborting preparation.");
+ return;
}
- Log( LOG_INFO, "Establishing connection to \"%s\", %s, port %d (connection %d) ... ", Conf_Server[Server].host, Conf_Server[Server].ip, Conf_Server[Server].port, Idx );
-
-#ifdef HAVE_INET_ATON
- if( inet_aton( Conf_Server[Server].ip, &inaddr ) == 0 )
-#else
- memset( &inaddr, 0, sizeof( inaddr ));
- inaddr.s_addr = inet_addr( Conf_Server[Server].ip );
- if( inaddr.s_addr == (unsigned)-1 )
-#endif
- {
- /* Can't convert IP address */
- Log( LOG_ERR, "Can't connect to \"%s\" (connection %d): can't convert ip address %s!", Conf_Server[Server].host, Idx, Conf_Server[Server].ip );
- goto out;
+ if (!ng_ipaddr_tostr_r(dest, ip_str)) {
+ Log(LOG_WARNING, "New_Server: Could not convert IP to string");
+ 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 );
+ af_dest = ng_ipaddr_af(dest);
+ new_sock = socket(af_dest, SOCK_STREAM, 0);
- new_sock = socket( PF_INET, SOCK_STREAM, 0 );
- if ( new_sock < 0 ) {
- /* Can't create socket */
- Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
- goto out;
+ Log(LOG_INFO,
+ "Establishing connection for \"%s\" to \"%s:%d\" (%s), socket %d ...",
+ Conf_Server[Server].name, Conf_Server[Server].host,
+ Conf_Server[Server].port, ip_str, new_sock);
+
+ if (new_sock < 0) {
+ Log(LOG_CRIT, "Can't create socket (af %d): %s!",
+ af_dest, strerror(errno));
+ return;
}
- if( ! Init_Socket( new_sock )) return;
+ if (!Init_Socket(new_sock))
+ return;
- res = connect( new_sock, (struct sockaddr *)&new_addr, sizeof( new_addr ));
+ /* 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)))
+ {
+ 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 )) {
- /* Can't connect socket */
Log( LOG_CRIT, "Can't connect socket: %s!", strerror( errno ));
close( new_sock );
- goto out;
+ 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 */
- Log( LOG_ALERT, "Can't establish connection: can't create 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 );
- goto out;
+ return;
+ }
+
+ if (!io_event_create( new_sock, IO_WANTWRITE, cb_connserver)) {
+ Log(LOG_ALERT, "io_event_create(): could not add fd %d", strerror(errno));
+ close(new_sock);
+ 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!" );
+ io_close(new_sock);
+ return;
+ }
+
+ /* Conn_Close() decrements this counter again */
+ Account_Connection();
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 ));
-
- /* Register new socket */
- if (!io_event_create( new_sock, IO_WANTWRITE, cb_connserver)) {
- Log( LOG_ALERT, "io_event_create(): could not add fd %d", strerror(errno));
- Conn_Close( Idx, "io_event_create() failed", NULL, false );
- goto out;
+ if (!Conf_SetServer(Server, new_sock))
+ return;
+ 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 ));
+
+#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;
+ return;
}
-
-#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;
+ 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.
+ *
+ * @param Idx Connection index.
+ */
+static void
+Init_Conn_Struct(CONN_ID Idx)
{
- time_t now = time( NULL );
- /* Connection-Struktur initialisieren */
+ time_t now = time(NULL);
- memset( &My_Connections[Idx], 0, sizeof ( CONNECTION ));
- My_Connections[Idx].sock = NONE;
+ 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;
+ Proc_InitStruct(&My_Connections[Idx].proc_stat);
+
+#ifdef ICONV
+ My_Connections[Idx].iconv_from = (iconv_t)(-1);
+ My_Connections[Idx].iconv_to = (iconv_t)(-1);
+#endif
} /* Init_Conn_Struct */
-LOCAL bool
+/**
+ * Initialize options of a new socket.
+ *
+ * For example, we try to set socket options SO_REUSEADDR and IPTOS_LOWDELAY.
+ * The socket is automatically closed if a fatal error is encountered.
+ *
+ * @param Sock Socket handle.
+ * @returns false if socket was closed due to fatal error.
+ */
+static bool
Init_Socket( int Sock )
{
- /* Initialize socket (set options) */
-
int value;
if (!io_setnonblock(Sock)) {
}
/* Set type of service (TOS) */
-#if defined(IP_TOS) && defined(IPTOS_LOWDELAY)
+#if defined(IPPROTO_IP) && defined(IPTOS_LOWDELAY)
value = IPTOS_LOWDELAY;
-#ifdef DEBUG
- Log( LOG_DEBUG, "Setting option IP_TOS on socket %d to IPTOS_LOWDELAY (%d).", Sock, value );
-#endif
- if( setsockopt( Sock, SOL_IP, IP_TOS, &value, (socklen_t)sizeof( value )) != 0 )
- {
- Log( LOG_ERR, "Can't set socket option IP_TOS: %s!", strerror( errno ));
+ if (setsockopt(Sock, IPPROTO_IP, IP_TOS, &value,
+ (socklen_t) sizeof(value))) {
+ LogDebug("Can't set socket option IP_TOS: %s!",
+ strerror(errno));
/* ignore this error */
- }
+ } else
+ LogDebug("IP_TOS on socket %d has been set to IPTOS_LOWDELAY.",
+ Sock);
#endif
return true;
} /* Init_Socket */
-GLOBAL
-void Read_Resolver_Result( int r_fd )
+/**
+ * Read results of a resolver sub-process and try to initiate a new server
+ * connection.
+ *
+ * @param fd File descriptor of the pipe to the sub-process.
+ * @param events (ignored IO specification)
+ */
+static void
+cb_Connect_to_Server(int 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.*/
+ /* 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. First result is tried immediately, rest
+ is saved for later if needed. */
- CLIENT *c;
- int len, i, n;
- RES_STAT *s;
- char *ptr;
+ LogDebug("Resolver: Got forward lookup callback on fd %d, events %d", fd, events);
- Log( LOG_DEBUG, "Resolver: started, fd %d\n", r_fd );
- /* Search associated connection ... */
- 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 ))
- break;
+ for (i=0; i < MAX_SERVERS; i++) {
+ if (Proc_GetPipeFd(&Conf_Server[i].res_stat) == fd )
+ break;
}
- if( i >= Pool_Size )
- {
- /* Ops, none found? Probably the connection has already
- * been closed!? We'll ignore that ... */
- io_close( r_fd );
-#ifdef DEBUG
- Log( LOG_DEBUG, "Resolver: Got result for unknown connection!?" );
-#endif
+
+ if( i >= MAX_SERVERS) {
+ /* Ops, no matching server found?! */
+ io_close( fd );
+ LogDebug("Resolver: Got Forward Lookup callback for unknown server!?");
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! */
- Log( LOG_CRIT, "Resolver: Can't read result: %s!", strerror( errno ));
- FreeRes_stat( &My_Connections[i] );
+ len = Proc_Read(&Conf_Server[i].res_stat, dest_addrs, sizeof(dest_addrs));
+ Proc_Close(&Conf_Server[i].res_stat);
+ if (len == 0) {
+ /* Error resolving hostname: reset server structure */
+ Conf_Server[i].conn_id = NONE;
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. */
+ 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 */
+
+
+/**
+ * Read results of a resolver sub-process from the pipe and update the
+ * apropriate connection/client structure(s): hostname and/or IDENT user name.
+ *
+ * @param r_fd File descriptor of the pipe to the sub-process.
+ * @param events (ignored IO specification)
+ */
+static void
+cb_Read_Resolver_Result( int r_fd, UNUSED short events )
+{
+ CLIENT *c;
+ CONN_ID i;
+ size_t len;
+ char *identptr;
#ifdef IDENTAUTH
-try_resolve:
+ char readbuf[HOST_LEN + 2 + CLIENT_USER_LEN];
+ char *ptr;
+#else
+ char readbuf[HOST_LEN + 1];
#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
+ LogDebug("Resolver: Got callback on fd %d, events %d", r_fd, events );
+ i = Conn_GetFromProc(r_fd);
+ if (i == NONE) {
+ /* Ops, none found? Probably the connection has already
+ * been closed!? We'll ignore that ... */
+ io_close( r_fd );
+ LogDebug("Resolver: Got callback for unknown connection!?");
+ return;
+ }
+
+ /* Read result from pipe */
+ len = Proc_Read(&My_Connections[i].proc_stat, readbuf, sizeof readbuf -1);
+ Proc_Close(&My_Connections[i].proc_stat);
+ if (len == 0)
+ return;
+
+ 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
+ * connections and a host name and IDENT user name (if enabled) for
* incoming connections.*/
- 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 )
- {
- switch(s->stage) {
- case 0: /* host name */
- strlcpy( My_Connections[i].host, s->buffer, sizeof( My_Connections[i].host ));
- Client_SetHostname( c, s->buffer );
+ assert ( My_Connections[i].sock >= 0 );
+ /* Incoming connection. Search client ... */
+ c = Conn_GetClient( i );
+ assert( c != NULL );
+
+ /* Only update client information of unregistered clients.
+ * Note: user commands (e. g. WEBIRC) are always read _after_ reading
+ * the resolver results, so we don't have to worry to override settings
+ * from these commands here. */
+ if(Client_Type(c) == CLIENT_UNKNOWN) {
+ strlcpy(My_Connections[i].host, readbuf,
+ sizeof(My_Connections[i].host));
+ Client_SetHostname(c, readbuf);
+ if (Conf_NoticeAuth)
+ (void)Conn_WriteStr(i,
+ "NOTICE AUTH :*** Found your hostname: %s",
+ My_Connections[i].host);
#ifdef IDENTAUTH
- /* clean up buffer for IDENT result */
- len = strlen( s->buffer ) + 1;
- assert((size_t) len <= sizeof( s->buffer ));
- memmove( s->buffer, s->buffer + len, sizeof( s->buffer ) - len );
- assert(len <= s->bufpos );
- s->bufpos -= len;
-
- /* Don't close pipe and clean up, but
- * instead wait for IDENT result */
- s->stage = 1;
- goto try_resolve;
-
- case 1: /* IDENT user name */
- if( 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
- break;
- default:
- Log( LOG_ERR, "Resolver: got result for unknown stage %d!?", s->stage );
+ ++identptr;
+ if (*identptr) {
+ ptr = identptr;
+ while (*ptr) {
+ if ((*ptr < '0' || *ptr > '9') &&
+ (*ptr < 'A' || *ptr > 'Z') &&
+ (*ptr < 'a' || *ptr > 'z'))
+ break;
+ ptr++;
+ }
+ if (*ptr) {
+ /* Erroneous IDENT reply */
+ Log(LOG_NOTICE,
+ "Got invalid IDENT reply for connection %d! Ignored.",
+ i);
+ } else {
+ Log(LOG_INFO,
+ "IDENT lookup for connection %d: \"%s\".",
+ i, identptr);
+ Client_SetUser(c, identptr, true);
+ }
+ if (Conf_NoticeAuth) {
+ (void)Conn_WriteStr(i,
+ "NOTICE AUTH :*** Got %sident response%s%s",
+ *ptr ? "invalid " : "",
+ *ptr ? "" : ": ",
+ *ptr ? "" : identptr);
}
+ } else {
+ Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i);
+ if (Conf_NoticeAuth && Conf_Ident)
+ (void)Conn_WriteStr(i,
+ "NOTICE AUTH :*** No ident response");
}
+#endif
+
+ if (Conf_NoticeAuth)
+ (void)Handle_Write(i);
+
+ Class_HandleServerBans(c);
+ }
#ifdef DEBUG
else Log( LOG_DEBUG, "Resolver: discarding result for already registered connection %d.", i );
#endif
+} /* cb_Read_Resolver_Result */
+
+
+/**
+ * Write a "simple" (error) message to a socket.
+ *
+ * The message is sent without using the connection write buffers, without
+ * compression/encryption, and even without any error reporting. It is
+ * designed for error messages of e.g. New_Connection().
+ *
+ * @param Sock Socket handle.
+ * @param Msg Message string to send.
+ */
+static void
+Simple_Message(int Sock, const char *Msg)
+{
+ char buf[COMMAND_LEN];
+ size_t len;
+
+ assert(Sock > NONE);
+ assert(Msg != NULL);
+
+ strlcpy(buf, Msg, sizeof buf - 2);
+ len = strlcat(buf, "\r\n", sizeof buf);
+ if (write(Sock, buf, len) < 0) {
+ /* Because this function most probably got called to log
+ * an error message, any write error is ignored here to
+ * avoid an endless loop. But casting the result of write()
+ * to "void" doesn't satisfy the GNU C code attribute
+ * "warn_unused_result" which is used by some versions of
+ * glibc (e.g. 2.11.1), therefore this silly error
+ * "handling" code here :-( */
+ return;
}
- else
- {
- /* Outgoing connection (server link): set the IP address
- * so that we can connect to it in the main loop. */
+} /* Simple_Error */
+
+
+/**
+ * Get CLIENT structure that belongs to a local connection identified by its
+ * index number. Each connection belongs to a client by definition, so it is
+ * not required that the caller checks for NULL return values.
+ *
+ * @param Idx Connection index number.
+ * @returns Pointer to CLIENT structure.
+ */
+GLOBAL CLIENT *
+Conn_GetClient( CONN_ID Idx )
+{
+ CONNECTION *c;
+
+ assert(Idx >= 0);
+ c = array_get(&My_ConnArray, sizeof (CONNECTION), (size_t)Idx);
+ assert(c != NULL);
+ return c ? c->client : NULL;
+}
+
+/**
+ * Get PROC_STAT sub-process structure of a connection.
+ *
+ * @param Idx Connection index number.
+ * @returns PROC_STAT structure.
+ */
+GLOBAL PROC_STAT *
+Conn_GetProcStat(CONN_ID Idx)
+{
+ CONNECTION *c;
+
+ assert(Idx >= 0);
+ c = array_get(&My_ConnArray, sizeof (CONNECTION), (size_t)Idx);
+ assert(c != NULL);
+ return &c->proc_stat;
+} /* Conn_GetProcStat */
- /* Search server ... */
- n = Conf_GetServer( i );
- assert( n > NONE );
- strlcpy( Conf_Server[n].ip, s->buffer, sizeof( Conf_Server[n].ip ));
+/**
+ * Get CONN_ID from file descriptor associated to a subprocess structure.
+ *
+ * @param fd File descriptor.
+ * @returns CONN_ID or NONE (-1).
+ */
+GLOBAL CONN_ID
+Conn_GetFromProc(int fd)
+{
+ int i;
+
+ assert(fd > 0);
+ for (i = 0; i < Pool_Size; i++) {
+ if ((My_Connections[i].sock != NONE)
+ && (Proc_GetPipeFd(&My_Connections[i].proc_stat) == fd))
+ return i;
}
+ return NONE;
+} /* Conn_GetFromProc */
- /* Clean up ... */
- FreeRes_stat( &My_Connections[i] );
- /* Reset penalty time */
- Conn_ResetPenalty( i );
-} /* Read_Resolver_Result */
+#ifndef STRICT_RFC
+GLOBAL long
+Conn_GetAuthPing(CONN_ID Idx)
+{
+ assert (Idx != NONE);
+ return My_Connections[Idx].auth_ping;
+} /* Conn_GetAuthPing */
-LOCAL void
-Simple_Message( int Sock, char *Msg )
+GLOBAL void
+Conn_SetAuthPing(CONN_ID Idx, long ID)
{
- 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 );
-
- strlcpy( buf, Msg, sizeof buf - 2);
- strlcat( buf, "\r\n", sizeof buf);
- (void)write( Sock, buf, strlen( buf ) );
-} /* Simple_Error */
+ assert (Idx != NONE);
+ My_Connections[Idx].auth_ping = ID;
+} /* Conn_SetAuthPing */
+
+#endif
+
+#ifdef SSL_SUPPORT
-LOCAL int
-Count_Connections( struct sockaddr_in addr_in )
+/**
+ * Get information about used SSL chiper.
+ *
+ * @param Idx Connection index number.
+ * @param buf Buffer for returned information text.
+ * @param len Size of return buffer "buf".
+ * @returns true on success, false otherwise.
+ */
+GLOBAL bool
+Conn_GetCipherInfo(CONN_ID Idx, char *buf, size_t len)
{
- 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++;
+ if (Idx < 0)
+ return false;
+ assert(Idx < (int) array_length(&My_ConnArray, sizeof(CONNECTION)));
+ return ConnSSL_GetCipherInfo(&My_Connections[Idx], buf, len);
+}
+
+
+/**
+ * Check if a connection is SSL-enabled or not.
+ *
+ * @param Idx Connection index number.
+ * @return true if connection is SSL-enabled, false otherwise.
+ */
+GLOBAL bool
+Conn_UsesSSL(CONN_ID Idx)
+{
+ if (Idx < 0)
+ return false;
+ assert(Idx < (int) array_length(&My_ConnArray, sizeof(CONNECTION)));
+ return Conn_OPTION_ISSET(&My_Connections[Idx], CONN_SSL);
+}
+
+#endif
+
+
+#ifdef DEBUG
+
+/**
+ * Dump internal state of the "connection module".
+ */
+GLOBAL void
+Conn_DebugDump(void)
+{
+ int i;
+
+ Log(LOG_DEBUG, "Connection status:");
+ for (i = 0; i < Pool_Size; i++) {
+ if (My_Connections[i].sock == NONE)
+ continue;
+ Log(LOG_DEBUG,
+ " - %d: host=%s, lastdata=%ld, lastping=%ld, delaytime=%ld, flag=%d, options=%d, bps=%d, client=%s",
+ My_Connections[i].sock, My_Connections[i].host,
+ My_Connections[i].lastdata, My_Connections[i].lastping,
+ My_Connections[i].delaytime, My_Connections[i].flag,
+ My_Connections[i].options, My_Connections[i].bps,
+ My_Connections[i].client ? Client_ID(My_Connections[i].client) : "-");
}
- return cnt;
-} /* Count_Connections */
+} /* Conn_DumpClients */
+#endif
/* -eof- */
projects / ngircd-alex.git / blobdiff