X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconn.c;h=62561544866413f5abb1534da27caac1e2aa2218;hp=e92240b6ff1548732f53e7d09e236b2a42ed23a9;hb=ffad2da835e26a1a457d4f4a16acf6797d4cc71e;hpb=477224be5c0d5e117d26d1181647bf9697c12c79 diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index e92240b6..62561544 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1,24 +1,26 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 Alexander Barton + * Copyright (c)2001-2014 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 */ - #define CONN_MODULE #include "portab.h" -#include "conf-ssl.h" -#include "io.h" -#include "imp.h" +/** + * @file + * Connection management + */ + +/* Additionan debug messages related to buffer handling: 0=off / 1=on */ +#define DEBUG_BUFFER 0 + #include #ifdef PROTOTYPES # include @@ -30,8 +32,9 @@ #include #include #include +#include #include -#include +#include #include #include #include @@ -43,47 +46,40 @@ # include #endif -#ifdef HAVE_STDINT_H -# include /* e.g. for Mac OS X */ -#endif - #ifdef TCPWRAP # include /* for TCP Wrappers */ #endif -#include "array.h" -#include "defines.h" - -#include "exp.h" #include "conn.h" -#include "imp.h" #include "ngircd.h" -#include "array.h" -#include "client.h" -#include "conf.h" +#include "class.h" +#ifdef ICONV +# include "conn-encoding.h" +#endif #include "conn-ssl.h" #include "conn-zip.h" #include "conn-func.h" +#include "io.h" #include "log.h" #include "ng_ipaddr.h" #include "parse.h" #include "resolve.h" -#include "tool.h" -#include "exp.h" +#define SERVER_WAIT (NONE - 1) /** "Wait for outgoing connection" flag */ +#define MAX_COMMANDS 3 /** Max. commands per loop for users */ +#define MAX_COMMANDS_SERVER_MIN 10 /** Min. commands per loop for servers */ +#define MAX_COMMANDS_SERVICE 10 /** Max. commands per loop for services */ -#define SERVER_WAIT (NONE - 1) - -#define MAX_COMMANDS 3 -#define MAX_COMMANDS_SERVER 10 -#define MAX_COMMANDS_SERVICE MAX_COMMANDS_SERVER +#define SD_LISTEN_FDS_START 3 /** systemd(8) socket activation offset */ +#define THROTTLE_CMDS 1 /** Throttling: max commands reached */ +#define THROTTLE_BPS 2 /** Throttling: max bps reached */ static bool Handle_Write PARAMS(( CONN_ID Idx )); static bool Conn_Write PARAMS(( CONN_ID Idx, char *Data, size_t Len )); -static int New_Connection PARAMS(( int Sock )); +static 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 )); @@ -95,7 +91,8 @@ 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)); - +static void Throttle_Connection PARAMS((const CONN_ID Idx, CLIENT *Client, + const int Reason, unsigned int Value)); static array My_Listeners; static array My_ConnArray; @@ -110,6 +107,9 @@ static void server_login PARAMS((CONN_ID idx)); #ifdef SSL_SUPPORT extern struct SSLOptions Conf_SSLOptions; +static bool SSL_WantRead PARAMS((const CONNECTION *c)); +static bool SSL_WantWrite PARAMS((const CONNECTION *c)); +static void cb_listen_ssl PARAMS((int sock, short irrelevant)); static void cb_connserver_login_ssl PARAMS((int sock, short what)); static void cb_clientserver_ssl PARAMS((int sock, short what)); #endif @@ -117,46 +117,62 @@ 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)); +time_t idle_t = 0; /** - * 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) + * Get number of sockets available from systemd(8). + * + * ngIRCd needs to implement its own sd_listen_fds(3) function and can't + * use the one provided by systemd itself, because the sockets will be + * used in a forked child process with a new PID, and this would trigger + * an error in the standard implementation. + * + * @return Number of sockets available, -1 if sockets have already been + * initialized, or 0 when no sockets have been passed. */ -static void -cb_listen(int sock, short irrelevant) +static int +my_sd_listen_fds(void) { - (void) irrelevant; - (void) New_Connection(sock); -} + const char *e; + int count; + + /* Check if LISTEN_PID exists; but we ignore the result, because + * normally ngircd forks a child before checking this, and therefore + * the PID set in the environment is always wrong ... */ + e = getenv("LISTEN_PID"); + if (!e || !*e) + return 0; + + e = getenv("LISTEN_FDS"); + if (!e || !*e) + return -1; + count = atoi(e); +#ifdef HAVE_UNSETENV + unsetenv("LISTEN_FDS"); +#endif + return count; +} -#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) + * 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_ssl(int sock, short irrelevant) +cb_listen(int sock, short irrelevant) { - int fd; - (void) irrelevant; - fd = New_Connection(sock); - if (fd < 0) - return; - io_event_setcb(My_Connections[fd].sock, cb_clientserver_ssl); + (void) New_Connection(sock, false); } -#endif - /** * IO callback for new outgoing non-SSL server connections. - * @param sock Socket descriptor - * @param what IO specification (IO_WANTREAD/IO_WANTWRITE/...) + * + * @param sock Socket descriptor. + * @param what IO specification (IO_WANTREAD/IO_WANTWRITE/...). */ static void cb_connserver(int sock, UNUSED short what) @@ -179,7 +195,7 @@ cb_connserver(int sock, UNUSED short what) 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); + Conn_Close(idx, "Connection aborted", NULL, false); return; } @@ -200,7 +216,7 @@ cb_connserver(int sock, UNUSED short what) My_Connections[idx].host, Conf_Server[server].port, idx, strerror(err)); - Conn_Close(idx, "Can't connect!", NULL, false); + Conn_Close(idx, "Can't connect", NULL, false); if (ng_ipaddr_af(&Conf_Server[server].dst_addr[0])) { /* more addresses to try... */ @@ -230,10 +246,10 @@ cb_connserver(int sock, UNUSED short what) server_login(idx); } - /** * Login to a remote server. - * @param idx Connection index + * + * @param idx Connection index. */ static void server_login(CONN_ID idx) @@ -247,50 +263,17 @@ server_login(CONN_ID idx) io_event_add( My_Connections[idx].sock, IO_WANTREAD|IO_WANTWRITE); /* Send PASS and SERVER command to peer */ - Conn_WriteStr( idx, "PASS %s %s", Conf_Server[Conf_GetServer( idx )].pwd_out, NGIRCd_ProtoID ); - Conn_WriteStr( idx, "SERVER %s :%s", Conf_ServerName, Conf_ServerInfo ); -} - - -#ifdef SSL_SUPPORT -/** - * IO callback for new outgoing SSL-enabled server connections. - * @param sock Socket descriptor - * @param what IO specification (IO_WANTREAD/IO_WANTWRITE/...) - */ -static void -cb_connserver_login_ssl(int sock, short unused) -{ - CONN_ID idx = Socket2Index(sock); - - assert(idx >= 0); - if (idx < 0) { - io_close(sock); - return; - } - (void) unused; - switch (ConnSSL_Connect( &My_Connections[idx])) { - case 1: break; - case 0: LogDebug("ConnSSL_Connect: not ready"); - return; - case -1: - Log(LOG_ERR, "SSL connection on socket %d failed!", sock); - Conn_Close(idx, "Can't connect!", NULL, false); - return; - } - - Log( LOG_INFO, "SSL connection %d with \"%s:%d\" established.", idx, - My_Connections[idx].host, Conf_Server[Conf_GetServer( idx )].port ); - - server_login(idx); + Conn_WriteStr(idx, "PASS %s %s", + Conf_Server[Conf_GetServer( idx )].pwd_out, NGIRCd_ProtoID); + Conn_WriteStr(idx, "SERVER %s :%s", + Conf_ServerName, Conf_ServerInfo); } -#endif - /** * IO callback for established non-SSL client and server connections. - * @param sock Socket descriptor - * @param what IO specification (IO_WANTREAD/IO_WANTWRITE/...) + * + * @param sock Socket descriptor. + * @param what IO specification (IO_WANTREAD/IO_WANTWRITE/...). */ static void cb_clientserver(int sock, short what) @@ -318,54 +301,14 @@ cb_clientserver(int sock, short what) Handle_Write(idx); } - -#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) -{ - CONN_ID idx = Socket2Index(sock); - - assert(idx >= 0); - - if (idx < 0) { - io_close(sock); - return; - } - - switch (ConnSSL_Accept(&My_Connections[idx])) { - case 1: - break; /* OK */ - case 0: - return; /* EAGAIN: 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); - - if (what & IO_WANTWRITE) - Handle_Write(idx); - - io_event_setcb(sock, cb_clientserver); /* SSL handshake completed */ -} -#endif - - /** - * Initialite connecion module. + * Initialize connection module. */ GLOBAL void Conn_Init( void ) { CONN_ID i; - /* Speicher fuer Verbindungs-Pool anfordern */ Pool_Size = CONNECTION_POOL; if ((Conf_MaxConnections > 0) && (Pool_Size > Conf_MaxConnections)) @@ -392,7 +335,6 @@ Conn_Init( void ) Init_Conn_Struct(i); } /* Conn_Init */ - /** * Clean up connection module. */ @@ -417,26 +359,33 @@ Conn_Exit( void ) io_library_shutdown(); } /* Conn_Exit */ - /** * 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(void) +Conn_CloseAllSockets(int ExceptOf) { CONN_ID idx; for(idx = 0; idx < Pool_Size; idx++) { - if(My_Connections[idx].sock > NONE) + if(My_Connections[idx].sock > NONE && + My_Connections[idx].sock != ExceptOf) close(My_Connections[idx].sock); } } - +/** + * 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)) +Init_Listeners(array *a, const char *listen_addr, void (*func)(int,short)) { unsigned int created = 0; size_t len; @@ -452,8 +401,9 @@ ports_initlisteners(array *a, const char *listen_addr, void (*func)(int,short)) continue; } if (!io_event_create( fd, IO_WANTREAD, func )) { - Log( LOG_ERR, "io_event_create(): Could not add listening fd %d (port %u): %s!", - fd, (unsigned int) *port, strerror(errno)); + Log(LOG_ERR, + "io_event_create(): Can't add fd %d (port %u): %s!", + fd, (unsigned int) *port, strerror(errno)); close(fd); port++; continue; @@ -464,24 +414,89 @@ ports_initlisteners(array *a, const char *listen_addr, void (*func)(int,short)) return created; } - /** * Initialize all listening sockets. - * @return Number of created 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; + char *af_str, *copy, *listen_addr; + int count, fd, i, addr_len; + ng_ipaddr_t addr; assert(Conf_ListenAddress); + count = my_sd_listen_fds(); + if (count < 0) { + Log(LOG_INFO, + "Not re-initializing listening sockets of systemd(8) ..."); + return 0; + } + if (count > 0) { + /* systemd(8) passed sockets to us, so don't try to initialize + * listening sockets on our own but use the passed ones */ + LogDebug("Initializing %d systemd sockets ...", count); + for (i = 0; i < count; i++) { + fd = SD_LISTEN_FDS_START + i; + addr_len = (int)sizeof(addr); + getsockname(fd, (struct sockaddr *)&addr, + (socklen_t*)&addr_len); +#ifdef WANT_IPV6 + if (addr.sin4.sin_family != AF_INET + && addr.sin4.sin_family != AF_INET6) +#else + if (addr.sin4.sin_family != AF_INET) +#endif + { + /* Socket is of unsupported type! For example, + * systemd passed in an IPv6 socket but ngIRCd + * isn't compiled with IPv6 support. */ + switch (addr.sin4.sin_family) + { + case AF_UNSPEC: af_str = "AF_UNSPEC"; break; + case AF_UNIX: af_str = "AF_UNIX"; break; + case AF_INET: af_str = "AF_INET"; break; +#ifdef AF_INET6 + case AF_INET6: af_str = "AF_INET6"; break; +#endif +#ifdef AF_NETLINK + case AF_NETLINK: af_str = "AF_NETLINK"; break; +#endif + default: af_str = "unknown"; break; + } + Log(LOG_CRIT, + "Socket %d is of unsupported type \"%s\" (%d), have to ignore it!", + fd, af_str, addr.sin4.sin_family); + close(fd); + continue; + } + + Init_Socket(fd); + if (!io_event_create(fd, IO_WANTREAD, cb_listen)) { + Log(LOG_ERR, + "io_event_create(): Can't add fd %d: %s!", + fd, strerror(errno)); + continue; + } + Log(LOG_INFO, + "Initialized socket %d from systemd(8): %s:%d.", fd, + ng_ipaddr_tostr(&addr), ng_ipaddr_getport(&addr)); + created++; + } + return created; + } + + /* not using systemd socket activation, initialize listening sockets: */ + /* 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)); + Log(LOG_CRIT, "Cannot copy %s: %s", Conf_ListenAddress, + strerror(errno)); return 0; } listen_addr = strtok(copy, ","); @@ -489,9 +504,11 @@ Conn_InitListeners( void ) while (listen_addr) { ngt_TrimStr(listen_addr); if (*listen_addr) { - created += ports_initlisteners(&Conf_ListenPorts, listen_addr, cb_listen); + created += Init_Listeners(&Conf_ListenPorts, + listen_addr, cb_listen); #ifdef SSL_SUPPORT - created += ports_initlisteners(&Conf_SSLOptions.ListenPorts, listen_addr, cb_listen_ssl); + created += Init_Listeners(&Conf_SSLOptions.ListenPorts, + listen_addr, cb_listen_ssl); #endif } @@ -507,7 +524,9 @@ Conn_InitListeners( void ) return created; } /* Conn_InitListeners */ - +/** + * Shut down all listening sockets. + */ GLOBAL void Conn_ExitListeners( void ) { @@ -515,7 +534,12 @@ Conn_ExitListeners( void ) int *fd; size_t arraylen; + /* Get number of listening sockets to shut down. There can be none + * if ngIRCd has been "socket activated" by systemd. */ arraylen = array_length(&My_Listeners, sizeof (int)); + if (arraylen < 1) + return; + Log(LOG_INFO, "Shutting down all listening sockets (%d total) ...", arraylen); fd = array_start(&My_Listeners); @@ -529,7 +553,14 @@ Conn_ExitListeners( void ) array_free(&My_Listeners); } /* Conn_ExitListeners */ - +/** + * 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) { @@ -538,13 +569,21 @@ InitSinaddrListenAddr(ng_ipaddr_t *addr, const char *listen_addrstr, UINT16 Port 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); + Log(LOG_CRIT, + "Can't bind to [%s]:%u: can't convert ip address \"%s\"!", + listen_addrstr, Port, listen_addrstr); } return ret; } - +/** + * 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) { @@ -562,8 +601,13 @@ set_v6_only(int af, int sock) #endif } - -/* return new listening port file descriptor or -1 on failure */ +/** + * 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) { @@ -576,8 +620,9 @@ NewListener(const char *listen_addr, UINT16 Port) 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)); + if (sock < 0) { + Log(LOG_CRIT, "Can't create socket (af %d) : %s!", af, + strerror(errno)); return -1; } @@ -587,22 +632,23 @@ NewListener(const char *listen_addr, UINT16 Port) 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)); + Log(LOG_CRIT, "Can't bind socket to address %s:%d - %s!", + ng_ipaddr_tostr(&addr), Port, strerror(errno)); close(sock); return -1; } - if( listen( sock, 10 ) != 0 ) { - Log( LOG_CRIT, "Can't listen on socket: %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; } /* 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 ); + 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; } @@ -611,50 +657,9 @@ NewListener(const char *listen_addr, UINT16 Port) return sock; } /* NewListener */ - -#ifdef SSL_SUPPORT -/* - * SSL/TLS connections require extra treatment: - * When either CONN_SSL_WANT_WRITE or CONN_SSL_WANT_READ is set, we - * need to take care of that first, before checking read/write buffers. - * For instance, while we might have data in our write buffer, the - * TLS/SSL protocol might need to read internal data first for TLS/SSL - * writes to succeed. - * - * If this function returns true, such a condition is met and we have - * to reverse the condition (check for read even if we've data to write, - * do not check for read but writeability even if write-buffer is empty). - */ -static bool -SSL_WantRead(const CONNECTION *c) -{ - if (Conn_OPTION_ISSET(c, CONN_SSL_WANT_READ)) { - io_event_add(c->sock, IO_WANTREAD); - return true; - } - return false; -} -static bool -SSL_WantWrite(const CONNECTION *c) -{ - if (Conn_OPTION_ISSET(c, CONN_SSL_WANT_WRITE)) { - io_event_add(c->sock, IO_WANTWRITE); - return true; - } - return false; -} -#else -static inline bool -SSL_WantRead(UNUSED const CONNECTION *c) -{ return false; } -static inline bool -SSL_WantWrite(UNUSED const CONNECTION *c) -{ return false; } -#endif - - /** * "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 @@ -665,7 +670,7 @@ GLOBAL void Conn_Handler(void) { int i; - unsigned int wdatalen, bytes_processed; + size_t wdatalen; struct timeval tv; time_t t; @@ -676,23 +681,15 @@ Conn_Handler(void) 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)) { + && (array_bytes(&My_Connections[i].rbuf) > 0)) { /* ... 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); - } + Handle_Buffer(i); } } @@ -701,7 +698,7 @@ Conn_Handler(void) if (My_Connections[i].sock <= NONE) continue; - wdatalen = (unsigned int)array_bytes(&My_Connections[i].wbuf); + wdatalen = array_bytes(&My_Connections[i].wbuf); #ifdef ZLIB if (wdatalen > 0 || array_bytes(&My_Connections[i].zip.wbuf) > 0) @@ -709,8 +706,10 @@ Conn_Handler(void) if (wdatalen > 0) #endif { +#ifdef SSL_SUPPORT if (SSL_WantRead(&My_Connections[i])) continue; +#endif io_event_add(My_Connections[i].sock, IO_WANTWRITE); } @@ -722,7 +721,9 @@ Conn_Handler(void) continue; #ifdef SSL_SUPPORT if (SSL_WantWrite(&My_Connections[i])) - continue; /* TLS/SSL layer needs to write data; deal with this first */ + /* TLS/SSL layer needs to write data; deal + * with this first! */ + continue; #endif if (Proc_InProgress(&My_Connections[i].proc_stat)) { /* Wait for completion of forked subprocess @@ -750,7 +751,7 @@ Conn_Handler(void) * 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! */ + * returns, so we have to set it before each call to it! */ tv.tv_usec = 0; tv.tv_sec = 1; @@ -763,6 +764,15 @@ Conn_Handler(void) PACKAGE_NAME); exit(1); } + + /* Should ngIRCd timeout when idle? */ + if (Conf_IdleTimeout > 0 && NumConnectionsAccepted > 0 + && idle_t > 0 && time(NULL) - idle_t >= Conf_IdleTimeout) { + LogDebug("Server idle timeout reached: %d second%s. Initiating shutdown ...", + Conf_IdleTimeout, + Conf_IdleTimeout == 1 ? "" : "s"); + NGIRCd_SignalQuit = true; + } } if (NGIRCd_SignalQuit) @@ -771,15 +781,16 @@ Conn_Handler(void) 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 @@ -793,9 +804,13 @@ va_dcl #endif { char buffer[COMMAND_LEN]; +#ifdef ICONV + char *ptr, *message; +#endif size_t len; bool ok; va_list ap; + int r; assert( Idx > NONE ); assert( Format != NULL ); @@ -805,7 +820,8 @@ va_dcl #else va_start( ap ); #endif - if (vsnprintf( buffer, COMMAND_LEN - 2, Format, ap ) >= COMMAND_LEN - 2 ) { + r = vsnprintf(buffer, COMMAND_LEN - 2, Format, ap); + if (r >= COMMAND_LEN - 2 || r == -1) { /* * The string that should be written to the socket is longer * than the allowed size of COMMAND_LEN bytes (including both @@ -821,11 +837,18 @@ va_dcl * * So we have a big problem here: we should send more bytes * to the network than we are allowed to and we don't know - * the originator (any more). The "old" behaviour of blaming + * the originator (any more). The "old" behavior of blaming * the receiver ("next hop") is a bad idea (it could be just * an other server only routing the message!), so the only * option left is to shorten the string and to hope that the * result is still somewhat useful ... + * + * Note: + * C99 states that vsnprintf() "returns the number of characters + * that would have been printed if the n were unlimited"; but + * according to the Linux manual page "glibc until 2.0.6 would + * return -1 when the output was truncated" -- so we have to + * handle both cases ... * -alex- */ @@ -833,6 +856,16 @@ va_dcl 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); @@ -846,39 +879,67 @@ va_dcl return ok; } /* Conn_WriteStr */ +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 ) +{ + 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. - * @return true on success, false otherwise. + * + * @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_LEN; + size_t writebuf_limit = WRITEBUFFER_MAX_LEN; assert( Idx > NONE ); assert( Data != NULL ); assert( Len > 0 ); - c = Conn_GetClient(Idx); - assert( c != NULL); - - /* 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; - /* 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 ) { + if (My_Connections[Idx].sock <= NONE) { LogDebug("Skipped write on closed socket (connection %d).", Idx); 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 )) { /* Compressed link: @@ -894,7 +955,7 @@ Conn_Write( CONN_ID Idx, char *Data, size_t Len ) /* Uncompressed link: * Check if outbound buffer has enough space for the data. */ if (array_bytes(&My_Connections[Idx].wbuf) + Len >= - writebuf_limit) { + WRITEBUFFER_FLUSH_LEN) { /* Buffer is full, flush it. Handle_Write deals with * low-level errors, if any. */ if (!Handle_Write(Idx)) @@ -906,10 +967,10 @@ Conn_Write( CONN_ID Idx, char *Data, size_t Len ) if (array_bytes(&My_Connections[Idx].wbuf) + Len >= writebuf_limit) { Log(LOG_NOTICE, - "Write buffer overflow (connection %d, limit is %lu bytes, %lu bytes new, %lu bytes pending)!", + "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 overflow!", NULL, false); + Conn_Close(Idx, "Write buffer space exhausted", NULL, false); return false; } @@ -926,11 +987,21 @@ Conn_Write( CONN_ID Idx, char *Data, size_t Len ) return true; } /* 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, const char *LogMsg, const 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; @@ -946,8 +1017,8 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie /* Is this link already shutting down? */ if( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ISCLOSING )) { /* Conn_Close() has been called recursively for this link; - * probabe reason: Handle_Write() failed -- see below. */ - LogDebug("Recursive request to close connection: %d", Idx ); + * probable reason: Handle_Write() failed -- see below. */ + LogDebug("Recursive request to close connection %d!", Idx ); return; } @@ -957,7 +1028,7 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie Conn_OPTION_ADD( &My_Connections[Idx], CONN_ISCLOSING ); port = ng_ipaddr_getport(&My_Connections[Idx].addr); - Log(LOG_INFO, "Shutting down connection %d (%s) with %s:%d ...", Idx, + Log(LOG_INFO, "Shutting down connection %d (%s) with \"%s:%d\" ...", Idx, LogMsg ? LogMsg : FwdMsg, My_Connections[Idx].host, port); /* Search client, if any */ @@ -993,7 +1064,7 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie 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); + LogDebug("SSL connection %d shutting down ...", Idx); ConnSSL_Free(&My_Connections[Idx]); } #endif @@ -1031,7 +1102,7 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie 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%%).", + "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); } @@ -1039,7 +1110,7 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie #endif { Log(LOG_INFO, - "Connection %d with %s:%d closed (in: %.1fk, out: %.1fk).", + "Connection %d with \"%s:%d\" closed (in: %.1fk, out: %.1fk).", Idx, My_Connections[Idx].host, port, in_k, out_k); } @@ -1059,6 +1130,8 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie 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 ); @@ -1068,30 +1141,43 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie NumConnections--; LogDebug("Shutdown of connection %d completed, %ld connection%s left.", Idx, NumConnections, NumConnections != 1 ? "s" : ""); -} /* Conn_Close */ + idle_t = NumConnections > 0 ? 0 : time(NULL); +} /* Conn_Close */ +/** + * 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) { 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. @@ -1123,9 +1209,24 @@ Conn_SyncServerStruct(void) } } /* SyncServerStruct */ +/** + * 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) +{ + assert(Idx > NONE); + return ng_ipaddr_tostr(&My_Connections[Idx].addr); +} /** * 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 ) @@ -1160,13 +1261,17 @@ Handle_Write( CONN_ID Idx ) return true; } +#if DEBUG_BUFFER LogDebug ("Handle_Write() called for connection %d, %ld bytes pending ...", Idx, wdatalen); +#endif #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); + len = ConnSSL_Write(&My_Connections[Idx], + array_start(&My_Connections[Idx].wbuf), + wdatalen); } else #endif { @@ -1177,9 +1282,14 @@ Handle_Write( CONN_ID Idx ) 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); + if (!Conn_OPTION_ISSET(&My_Connections[Idx], CONN_ISCLOSING)) + Log(LOG_ERR, + "Write error on connection %d (socket %d): %s!", + Idx, My_Connections[Idx].sock, strerror(errno)); + else + LogDebug("Recursive write error on connection %d (socket %d): %s!", + Idx, My_Connections[Idx].sock, strerror(errno)); + Conn_Close(Idx, "Write error", NULL, false); return false; } @@ -1189,8 +1299,12 @@ Handle_Write( CONN_ID Idx ) return true; } /* Handle_Write */ - -static int +/** + * Count established connections to a specific IP address. + * + * @returns Number of established connections. + */ +static int Count_Connections(ng_ipaddr_t *a) { int i, cnt; @@ -1205,26 +1319,29 @@ Count_Connections(ng_ipaddr_t *a) return cnt; } /* Count_Connections */ - /** * Initialize new client connection on a listening socket. - * @param Sock Listening socket descriptor - * @return Accepted socket descriptor or -1 on error + * + * @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) +New_Connection(int Sock, UNUSED bool IsSSL) { #ifdef TCPWRAP struct request_info req; #endif ng_ipaddr_t new_addr; char ip_str[NG_INET_ADDRSTRLEN]; - int new_sock, new_sock_len, identsock; + int new_sock, new_sock_len; CLIENT *c; 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); @@ -1309,7 +1426,7 @@ New_Connection(int Sock) return -1; } - c = Client_NewLocal(new_sock, ip_str, CLIENT_UNKNOWN, false); + c = Client_NewLocal(new_sock, NULL, CLIENT_UNKNOWN, false); if (!c) { Log(LOG_ALERT, "Can't accept connection: can't create client structure!"); @@ -1334,35 +1451,83 @@ New_Connection(int Sock) Client_SetHostname(c, My_Connections[new_sock].host); - Log(LOG_INFO, "Accepted connection %d from %s:%d on socket %d.", + 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(); - identsock = new_sock; -#ifdef IDENTAUTH - if (!Conf_Ident) - identsock = -1; +#ifdef SSL_SUPPORT + /* Delay connection initalization until SSL handshake is finished */ + if (!IsSSL) #endif - if (Conf_DNS) - Resolve_Addr(&My_Connections[new_sock].proc_stat, &new_addr, - identsock, cb_Read_Resolver_Result); + Conn_StartLogin(new_sock); - Account_Connection(); return new_sock; } /* New_Connection */ +/** + * Finish connection initialization, start resolver subprocess. + * + * @param Idx Connection index. + */ +GLOBAL void +Conn_StartLogin(CONN_ID Idx) +{ + int ident_sock = -1; + + assert(Idx >= 0); + + /* Nothing to do if DNS (and resolver subprocess) is disabled */ + if (!Conf_DNS) + return; + +#ifdef IDENTAUTH + /* Should we make an IDENT request? */ + if (Conf_Ident) + ident_sock = My_Connections[Idx].sock; +#endif + + 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"); + /* Send buffered data to the client, but break on errors + * because Handle_Write() would have closed the connection + * again in this case! */ + if (!Handle_Write(Idx)) + return; + } + + 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++; + idle_t = 0; 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 ) { @@ -1377,10 +1542,11 @@ Socket2Index( int Sock ) return Sock; } /* Socket2Index */ - /** - * Read data from the network to the read buffer. If an error occures, + * Read data from the network to the read buffer. If an error occurs, * the socket of this connection will be shut down. + * + * @param Idx Connection index. */ static void Read_Request( CONN_ID Idx ) @@ -1402,9 +1568,9 @@ Read_Request( CONN_ID Idx ) { /* Read buffer is full */ Log(LOG_ERR, - "Receive buffer overflow (connection %d): %d bytes!", - Idx, array_bytes(&My_Connections[Idx].rbuf)); - Conn_Close( Idx, "Receive buffer overflow!", NULL, false ); + "Receive buffer space exhausted (connection %d): %d/%d bytes", + Idx, array_bytes(&My_Connections[Idx].rbuf), READBUFFER_LEN); + Conn_Close(Idx, "Receive buffer space exhausted", NULL, false); return; } @@ -1415,13 +1581,10 @@ Read_Request( CONN_ID Idx ) #endif len = read(My_Connections[Idx].sock, readbuf, sizeof(readbuf)); if (len == 0) { - Log(LOG_INFO, "%s:%u (%s) is closing the connection ...", - My_Connections[Idx].host, - (unsigned int) ng_ipaddr_getport(&My_Connections[Idx].addr), - ng_ipaddr_tostr(&My_Connections[Idx].addr)); - Conn_Close(Idx, - "Socket closed!", "Client closed connection", - false); + 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; } @@ -1429,7 +1592,7 @@ Read_Request( CONN_ID Idx ) 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", + Conn_Close(Idx, "Read error", "Client closed connection", false); return; } @@ -1438,9 +1601,9 @@ Read_Request( CONN_ID Idx ) if (!array_catb(&My_Connections[Idx].zip.rbuf, readbuf, (size_t) len)) { Log(LOG_ERR, - "Could not append recieved data to zip input buffer (connn %d): %d bytes!", + "Could not append received data to zip input buffer (connection %d): %d bytes!", Idx, len); - Conn_Close(Idx, "Receive buffer overflow!", NULL, + Conn_Close(Idx, "Receive buffer space exhausted", NULL, false); return; } @@ -1448,13 +1611,18 @@ Read_Request( CONN_ID Idx ) #endif { if (!array_catb( &My_Connections[Idx].rbuf, readbuf, len)) { - Log( LOG_ERR, "Could not append recieved data to input buffer (connn %d): %d bytes!", Idx, len ); - Conn_Close( Idx, "Receive buffer overflow!", NULL, false ); + 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 ); } } /* Update connection statistics */ My_Connections[Idx].bytes_in += len; + + /* Handle read buffer */ My_Connections[Idx].bps += Handle_Buffer(Idx); /* Make sure that there is still a valid client registered */ @@ -1480,24 +1648,19 @@ Read_Request( CONN_ID 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); - } + if (My_Connections[Idx].bps >= maxbps) + Throttle_Connection(Idx, c, THROTTLE_BPS, maxbps); } /* Read_Request */ - /** * 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. - * @return number of bytes processed. + * + * @param Idx Index of the connection. + * @returns Number of bytes processed. */ static unsigned int Handle_Buffer(CONN_ID Idx) @@ -1515,18 +1678,29 @@ Handle_Buffer(CONN_ID Idx) CLIENT *c; c = Conn_GetClient(Idx); - assert( c != NULL); + starttime = time(NULL); + + assert(c != NULL); - /* Servers do get special command limits, so they can process - * all the messages that are required while peering. */ + /* Servers get special command limits that depend on the user count */ switch (Client_Type(c)) { case CLIENT_SERVER: - maxcmd = MAX_COMMANDS_SERVER; break; + 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 synchronization. */ + if (Conn_LastPing(Idx) == 0) + maxcmd *= 5; + break; case CLIENT_SERVICE: - maxcmd = MAX_COMMANDS_SERVICE; break; + maxcmd = MAX_COMMANDS_SERVICE; + break; + case CLIENT_USER: + if (Client_HasMode(c, 'F')) + maxcmd = MAX_COMMANDS_SERVICE; + break; } - starttime = time(NULL); for (i=0; i < maxcmd; i++) { /* Check penalty */ if (My_Connections[Idx].delaytime > starttime) @@ -1566,7 +1740,7 @@ Handle_Buffer(CONN_ID Idx) 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: */ + * correct CR+LF line terminator: */ first_eol = ptr1 < ptr2 ? ptr1 : ptr2; if (first_eol < ptr) { /* Single CR or LF before CR+LF found */ @@ -1621,8 +1795,6 @@ Handle_Buffer(CONN_ID Idx) return 0; /* error -> connection has been closed */ array_moveleft(&My_Connections[Idx].rbuf, 1, len); - LogDebug("Connection %d: %d bytes left in read buffer.", - Idx, array_bytes(&My_Connections[Idx].rbuf)); #ifdef ZLIB if ((!old_z) && (My_Connections[Idx].options & CONN_ZIP) && (array_bytes(&My_Connections[Idx].rbuf) > 0)) { @@ -1645,10 +1817,20 @@ Handle_Buffer(CONN_ID Idx) } #endif } +#if DEBUG_BUFFER + LogDebug("Connection %d: Processed %ld commands (max=%ld), %ld bytes. %ld bytes left in read buffer.", + Idx, i, maxcmd, len_processed, + array_bytes(&My_Connections[Idx].rbuf)); +#endif + + /* If data has been processed but there is still data in the read + * buffer, the command limit triggered. Enforce the penalty time: */ + if (len_processed && array_bytes(&My_Connections[Idx].rbuf) > 2) + Throttle_Connection(Idx, c, THROTTLE_CMDS, maxcmd); + return len_processed; } /* Handle_Buffer */ - /** * Check whether established connections are still alive or not. * If not, play PING-PONG first; and if that doesn't help either, @@ -1676,17 +1858,17 @@ Check_Connections(void) if (My_Connections[i].lastping < time(NULL) - Conf_PongTimeout) { /* Timeout */ - LogDebug - ("Connection %d: Ping timeout: %d seconds.", - i, Conf_PongTimeout); - snprintf(msg, sizeof(msg), "Ping timeout: %d seconds", Conf_PongTimeout); + 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); - My_Connections[i].lastping = time(NULL); + Conn_UpdatePing(i); Conn_WriteStr(i, "PING :%s", Client_ID(Client_ThisServer())); } @@ -1707,7 +1889,6 @@ Check_Connections(void) } } /* Check_Connections */ - /** * Check if further server links should be established. */ @@ -1723,7 +1904,7 @@ Check_Servers(void) 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) + 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 */ @@ -1755,7 +1936,12 @@ Check_Servers(void) } } /* Check_Servers */ - +/** + * 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) { @@ -1766,8 +1952,17 @@ New_Server( int Server , ng_ipaddr_t *dest) assert( Server > NONE ); + /* 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; + } + if (!ng_ipaddr_tostr_r(dest, ip_str)) { Log(LOG_WARNING, "New_Server: Could not convert IP to string"); + Conf_Server[Server].conn_id = NONE; return; } @@ -1782,26 +1977,33 @@ New_Server( int Server , ng_ipaddr_t *dest) if (new_sock < 0) { Log(LOG_CRIT, "Can't create socket (af %d): %s!", af_dest, strerror(errno)); + Conf_Server[Server].conn_id = NONE; return; } - if (!Init_Socket(new_sock)) + if (!Init_Socket(new_sock)) { + Conf_Server[Server].conn_id = NONE; return; + } /* 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 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)); + Log(LOG_WARNING, "Can't bind socket to %s: %s!", ip_str, + strerror(errno)); } ng_ipaddr_setport(dest, Conf_Server[Server].port); res = connect(new_sock, (struct sockaddr *) dest, ng_ipaddr_salen(dest)); if(( res != 0 ) && ( errno != EINPROGRESS )) { Log( LOG_CRIT, "Can't connect socket: %s!", strerror( errno )); close( new_sock ); + Conf_Server[Server].conn_id = NONE; return; } @@ -1810,6 +2012,15 @@ New_Server( int Server , ng_ipaddr_t *dest) "Cannot allocate memory for server connection (socket %d)", new_sock); close( new_sock ); + Conf_Server[Server].conn_id = NONE; + 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); + Conf_Server[Server].conn_id = NONE; return; } @@ -1823,7 +2034,8 @@ New_Server( int Server , ng_ipaddr_t *dest) c = Client_NewLocal(new_sock, ip_str, CLIENT_UNKNOWNSERVER, false); if (!c) { Log( LOG_ALERT, "Can't establish connection: can't create client structure!" ); - close( new_sock ); + io_close(new_sock); + Conf_Server[Server].conn_id = NONE; return; } @@ -1833,27 +2045,22 @@ New_Server( int Server , ng_ipaddr_t *dest) Client_SetToken( c, TOKEN_OUTBOUND ); /* Register connection */ - Conf_Server[Server].conn_id = new_sock; + 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 )); - /* 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( new_sock, "io_event_create() failed", NULL, false ); - Init_Conn_Struct( new_sock ); - Conf_Server[Server].conn_id = NONE; - } #ifdef SSL_SUPPORT - if (Conf_Server[Server].SSLConnect && !ConnSSL_PrepareConnect( &My_Connections[new_sock], - &Conf_Server[Server] )) + 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 ); + 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; } @@ -1863,9 +2070,10 @@ New_Server( int Server , ng_ipaddr_t *dest) Conn_OPTION_ADD( &My_Connections[new_sock], CONN_ISCONNECTING ); } /* New_Server */ - /** * Initialize connection structure. + * + * @param Idx Connection index. */ static void Init_Conn_Struct(CONN_ID Idx) @@ -1878,58 +2086,79 @@ Init_Conn_Struct(CONN_ID Idx) My_Connections[Idx].lastdata = now; My_Connections[Idx].lastprivmsg = now; Proc_InitStruct(&My_Connections[Idx].proc_stat); -} /* Init_Conn_Struct */ +#ifdef ICONV + My_Connections[Idx].iconv_from = (iconv_t)(-1); + My_Connections[Idx].iconv_to = (iconv_t)(-1); +#endif +} /* Init_Conn_Struct */ +/** + * 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)) { - Log( LOG_CRIT, "Can't enable non-blocking mode for socket: %s!", strerror( errno )); - close( Sock ); + Log(LOG_CRIT, "Can't enable non-blocking mode for socket: %s!", + strerror(errno)); + close(Sock); return false; } /* Don't block this port after socket shutdown */ value = 1; - if( setsockopt( Sock, SOL_SOCKET, SO_REUSEADDR, &value, (socklen_t)sizeof( value )) != 0 ) - { - Log( LOG_ERR, "Can't set socket option SO_REUSEADDR: %s!", strerror( errno )); + if (setsockopt(Sock, SOL_SOCKET, SO_REUSEADDR, &value, + (socklen_t)sizeof(value)) != 0) { + Log(LOG_ERR, "Can't set socket option SO_REUSEADDR: %s!", + strerror(errno)); /* ignore this error */ } /* Set type of service (TOS) */ #if defined(IPPROTO_IP) && defined(IPTOS_LOWDELAY) value = IPTOS_LOWDELAY; - LogDebug("Setting IP_TOS on socket %d to IPTOS_LOWDELAY.", Sock); 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 */ - +/** + * 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 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. */ - LogDebug("Resolver: Got forward lookup callback on fd %d, events %d", fd, events); + /* we can handle at most 3 addresses; but we read up to 4 so we can + * log the 'more than we can handle' condition. First result is tried + * immediately, rest is saved for later if needed. */ + ng_ipaddr_t dest_addrs[4]; + + LogDebug("Resolver: Got forward lookup callback on fd %d, events %d", + fd, events); for (i=0; i < MAX_SERVERS; i++) { if (Proc_GetPipeFd(&Conf_Server[i].res_stat) == fd ) @@ -1945,6 +2174,7 @@ cb_Connect_to_Server(int fd, UNUSED short events) /* Read result from pipe */ 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; @@ -1953,7 +2183,8 @@ cb_Connect_to_Server(int fd, UNUSED short events) assert((len % sizeof(ng_ipaddr_t)) == 0); - LogDebug("Got result from resolver: %u structs (%u bytes).", len/sizeof(ng_ipaddr_t), len); + 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)) { @@ -1971,20 +2202,23 @@ cb_Connect_to_Server(int fd, UNUSED short events) New_Server(i, dest_addrs); } /* cb_Read_Forward_Lookup */ - +/** + * Read results of a resolver sub-process from the pipe and update the + * appropriate 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 ) { - /* Read result of resolver sub-process from pipe and update the - * apropriate connection/client structure(s): hostname and/or - * IDENT user name.*/ - CLIENT *c; CONN_ID i; size_t len; char *identptr; #ifdef IDENTAUTH char readbuf[HOST_LEN + 2 + CLIENT_USER_LEN]; + char *ptr; #else char readbuf[HOST_LEN + 1]; #endif @@ -2001,6 +2235,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) /* 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; @@ -2030,27 +2265,73 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) 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 ++identptr; if (*identptr) { - Log(LOG_INFO, "IDENT lookup for connection %d: \"%s\".", i, identptr); - Client_SetUser(c, identptr, true); - } else { + 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 if(Conf_Ident) { Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i); + if (Conf_NoticeAuth) + (void)Conn_WriteStr(i, + "NOTICE AUTH :*** No ident response"); } #endif + + if (Conf_NoticeAuth) { + /* Send buffered data to the client, but break on + * errors because Handle_Write() would have closed + * the connection again in this case! */ + if (!Handle_Write(i)) + return; + } + + Class_HandleServerBans(c); } #ifdef DEBUG - else Log( LOG_DEBUG, "Resolver: discarding result for already registered connection %d.", i ); + else + LogDebug("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(). */ + * 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) { @@ -2074,13 +2355,13 @@ Simple_Message(int Sock, const char *Msg) } } /* 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 - * @return Pointer to CLIENT structure + * + * @param Idx Connection index number. + * @returns Pointer to CLIENT structure. */ GLOBAL CLIENT * Conn_GetClient( CONN_ID Idx ) @@ -2095,8 +2376,9 @@ Conn_GetClient( CONN_ID Idx ) /** * Get PROC_STAT sub-process structure of a connection. - * @param Idx Connection index number - * @return PROC_STAT structure + * + * @param Idx Connection index number. + * @returns PROC_STAT structure. */ GLOBAL PROC_STAT * Conn_GetProcStat(CONN_ID Idx) @@ -2109,11 +2391,11 @@ Conn_GetProcStat(CONN_ID Idx) return &c->proc_stat; } /* Conn_GetProcStat */ - /** * Get CONN_ID from file descriptor associated to a subprocess structure. - * @param fd File descriptor - * @return CONN_ID or NONE (-1) + * + * @param fd File descriptor. + * @returns CONN_ID or NONE (-1). */ GLOBAL CONN_ID Conn_GetFromProc(int fd) @@ -2129,15 +2411,194 @@ Conn_GetFromProc(int fd) return NONE; } /* Conn_GetFromProc */ +/** + * Throttle a connection because of excessive usage. + * + * @param Reason The reason, see THROTTLE_xxx constants. + * @param Idx The connection index. + * @param Client The client of this connection. + * @param Seconds The time to delay this connection. + */ +static void +Throttle_Connection(const CONN_ID Idx, CLIENT *Client, const int Reason, + unsigned int Value) +{ + assert(Idx > NONE); + assert(Client != NULL); + + /* Never throttle servers or services, only interrupt processing */ + if (Client_Type(Client) == CLIENT_SERVER + || Client_Type(Client) == CLIENT_UNKNOWNSERVER + || Client_Type(Client) == CLIENT_SERVICE) + return; + + /* Don't throttle clients with user mode 'F' set */ + if (Client_HasMode(Client, 'F')) + return; + + LogDebug("Throttling connection %d: code %d, value %d!", Idx, + Reason, Value); + Conn_SetPenalty(Idx, 1); +} + +#ifndef STRICT_RFC + +GLOBAL long +Conn_GetAuthPing(CONN_ID Idx) +{ + assert (Idx != NONE); + return My_Connections[Idx].auth_ping; +} /* Conn_GetAuthPing */ + +GLOBAL void +Conn_SetAuthPing(CONN_ID Idx, long ID) +{ + assert (Idx != NONE); + My_Connections[Idx].auth_ping = ID; +} /* Conn_SetAuthPing */ + +#endif /* STRICT_RFC */ #ifdef SSL_SUPPORT /** - * 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" - * @return true on success, false otherwise + * IO callback for new 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, UNUSED short what) +{ + CONN_ID idx = Socket2Index(sock); + + assert(idx >= 0); + + if (idx < 0) { + io_close(sock); + return; + } + + switch (ConnSSL_Accept(&My_Connections[idx])) { + case 1: + break; /* OK */ + case 0: + return; /* EAGAIN: callback will be invoked again by IO layer */ + default: + Conn_Close(idx, + "SSL accept error, closing socket", "SSL accept error", + false); + return; + } + + io_event_setcb(sock, cb_clientserver); /* SSL handshake completed */ +} + +/** + * 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); +} + +/** + * IO callback for new outgoing SSL-enabled server connections. + * + * @param sock Socket descriptor. + * @param unused (ignored IO specification) + */ +static void +cb_connserver_login_ssl(int sock, short unused) +{ + CONN_ID idx = Socket2Index(sock); + + assert(idx >= 0); + if (idx < 0) { + io_close(sock); + return; + } + (void) unused; + switch (ConnSSL_Connect( &My_Connections[idx])) { + case 1: break; + case 0: LogDebug("ConnSSL_Connect: not ready"); + return; + case -1: + Log(LOG_ERR, "SSL connection on socket %d failed!", sock); + Conn_Close(idx, "Can't connect", NULL, false); + return; + } + + Log( LOG_INFO, "SSL connection %d with \"%s:%d\" established.", idx, + My_Connections[idx].host, Conf_Server[Conf_GetServer( idx )].port ); + + server_login(idx); +} + + +/** + * 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; +} + +/** + * Get information about used SSL cipher. + * + * @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) @@ -2148,11 +2609,11 @@ Conn_GetCipherInfo(CONN_ID Idx, char *buf, size_t len) 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. + * + * @param Idx Connection index number. + * @return true if connection is SSL-enabled, false otherwise. */ GLOBAL bool Conn_UsesSSL(CONN_ID Idx) @@ -2163,11 +2624,51 @@ Conn_UsesSSL(CONN_ID Idx) return Conn_OPTION_ISSET(&My_Connections[Idx], CONN_SSL); } -#endif +GLOBAL char * +Conn_GetCertFp(CONN_ID Idx) +{ + if (Idx < 0) + return NULL; + assert(Idx < (int) array_length(&My_ConnArray, sizeof(CONNECTION))); + return ConnSSL_GetCertFp(&My_Connections[Idx]); +} +GLOBAL bool +Conn_SetCertFp(CONN_ID Idx, const char *fingerprint) +{ + if (Idx < 0) + return false; + assert(Idx < (int) array_length(&My_ConnArray, sizeof(CONNECTION))); + return ConnSSL_SetCertFp(&My_Connections[Idx], fingerprint); +} + +#else /* SSL_SUPPORT */ + +GLOBAL bool +Conn_UsesSSL(UNUSED CONN_ID Idx) +{ + return false; +} + +GLOBAL char * +Conn_GetCertFp(UNUSED CONN_ID Idx) +{ + return NULL; +} + +GLOBAL bool +Conn_SetCertFp(UNUSED CONN_ID Idx, UNUSED const char *fingerprint) +{ + return true; +} + +#endif /* SSL_SUPPORT */ #ifdef DEBUG +/** + * Dump internal state of the "connection module". + */ GLOBAL void Conn_DebugDump(void) { @@ -2187,7 +2688,6 @@ Conn_DebugDump(void) } } /* Conn_DumpClients */ -#endif - +#endif /* DEBUG */ /* -eof- */