X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconn.c;h=ca7030f4ebae1e487910310da2278e96f8287252;hp=3f447c61ec367916f528f13a9da0852ac83eb0f4;hb=54fac576030d7aaf8bce4a982c880fe18680741e;hpb=5a424f60dad660815d89285da9a7a07e4991461a diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 3f447c61..ca7030f4 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors. + * Copyright (c)2001-2019 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 @@ -9,20 +9,19 @@ * Please read the file COPYING, README and AUTHORS for more information. */ -#undef DEBUG_BUFFER - #define CONN_MODULE +#define CONN_MODULE_GLOBAL_INIT #include "portab.h" -#include "conf-ssl.h" -#include "io.h" /** * @file * Connection management */ -#include "imp.h" +/* Additionan debug messages related to buffer handling: 0=off / 1=on */ +#define DEBUG_BUFFER 0 + #include #ifdef PROTOTYPES # include @@ -34,8 +33,9 @@ #include #include #include +#include #include -#include +#include #include #include #include @@ -51,39 +51,32 @@ # 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 "class.h" -#include "conf.h" -#include "conn-encoding.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_MIN 10 -#define MAX_COMMANDS_SERVICE 10 - -#define SD_LISTEN_FDS_START 3 +#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 )); @@ -99,7 +92,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; @@ -114,6 +108,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 @@ -123,7 +120,6 @@ static void cb_clientserver PARAMS((int sock, short what)); time_t idle_t = 0; - /** * Get number of sockets available from systemd(8). * @@ -159,7 +155,6 @@ my_sd_listen_fds(void) return count; } - /** * IO callback for listening sockets: handle new connections. This callback * gets called when a new non-SSL connection should be accepted. @@ -174,29 +169,6 @@ cb_listen(int sock, short irrelevant) (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. * @@ -211,7 +183,6 @@ cb_connserver(int sock, UNUSED short what) CONN_ID idx = Socket2Index( sock ); if (idx <= NONE) { - LogDebug("cb_connserver wants to write on unknown socket?!"); io_close(sock); return; } @@ -275,7 +246,6 @@ cb_connserver(int sock, UNUSED short what) server_login(idx); } - /** * Login to a remote server. * @@ -293,46 +263,11 @@ 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 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); + 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. @@ -345,12 +280,11 @@ cb_clientserver(int sock, short what) { CONN_ID idx = Socket2Index(sock); - assert(idx >= 0); - - if (idx < 0) { + if (idx <= NONE) { io_close(sock); return; } + #ifdef SSL_SUPPORT if (what & IO_WANTREAD || (Conn_OPTION_ISSET(&My_Connections[idx], CONN_SSL_WANT_WRITE))) { @@ -366,78 +300,28 @@ cb_clientserver(int sock, short what) Handle_Write(idx); } - -#ifdef SSL_SUPPORT -/** - * 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 */ -} -#endif - - /** * Initialize connection module. */ GLOBAL void Conn_Init( void ) { - CONN_ID i; + int size; - Pool_Size = CONNECTION_POOL; - 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]"); + /* Initialize the "connection pool". + * FIXME: My_Connetions/Pool_Size is needed by other parts of the + * code; remove them! */ + Pool_Size = 0; + size = Conf_MaxConnections > 0 ? Conf_MaxConnections : CONNECTION_POOL; + if (Socket2Index(size) <= NONE) { + Log(LOG_EMERG, "Failed to initialize connection pool!"); exit(1); } - /* FIXME: My_Connetions/Pool_Size is needed by other parts of the - * code; remove them! */ - My_Connections = (CONNECTION*) array_start(&My_ConnArray); - - LogDebug("Allocated connection pool for %d items (%ld bytes).", - array_length(&My_ConnArray, sizeof(CONNECTION)), - array_bytes(&My_ConnArray)); - - assert(array_length(&My_ConnArray, sizeof(CONNECTION)) >= (size_t)Pool_Size); - + /* Initialize "listener" array. */ array_free( &My_Listeners ); - - for (i = 0; i < Pool_Size; i++) - Init_Conn_Struct(i); } /* Conn_Init */ - /** * Clean up connection module. */ @@ -462,7 +346,6 @@ 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 @@ -480,7 +363,6 @@ Conn_CloseAllSockets(int ExceptOf) } } - /** * Initialize listening ports. * @@ -519,7 +401,6 @@ Init_Listeners(array *a, const char *listen_addr, void (*func)(int,short)) return created; } - /** * Initialize all listening sockets. * @@ -549,15 +430,18 @@ Conn_InitListeners( void ) 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); + 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) + 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. */ + /* 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; @@ -627,7 +511,6 @@ Conn_InitListeners( void ) return created; } /* Conn_InitListeners */ - /** * Shut down all listening sockets. */ @@ -657,7 +540,6 @@ Conn_ExitListeners( void ) array_free(&My_Listeners); } /* Conn_ExitListeners */ - /** * Bind a socket to a specific (source) address. * @@ -674,13 +556,13 @@ 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 listen on [%s]:%u: Failed to parse IP address!", + listen_addrstr, Port); } 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, @@ -706,7 +588,6 @@ set_v6_only(int af, int sock) #endif } - /** * Initialize new listening port. * @@ -763,67 +644,6 @@ NewListener(const char *listen_addr, UINT16 Port) return sock; } /* NewListener */ - -#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; -} - -#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. * @@ -837,10 +657,13 @@ GLOBAL void Conn_Handler(void) { int i; - unsigned int wdatalen, bytes_processed; + size_t wdatalen; struct timeval tv; time_t t; + Log(LOG_NOTICE, "Server \"%s\" (on \"%s\") ready.", + Client_ID(Client_ThisServer()), Client_Hostname(Client_ThisServer())); + while (!NGIRCd_SignalQuit && !NGIRCd_SignalRestart) { t = time(NULL); @@ -856,17 +679,7 @@ Conn_Handler(void) if ((My_Connections[i].sock > NONE) && (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); } } @@ -875,7 +688,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) @@ -883,8 +696,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); } @@ -896,7 +711,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 @@ -917,6 +734,18 @@ Conn_Handler(void) continue; } + if (array_bytes(&My_Connections[i].rbuf) >= COMMAND_LEN) { + /* There is still more data in the read buffer + * than a single valid command can get long: + * so either there is a complete command, or + * invalid data. Therefore don't try to read in + * even more data from the network but wait for + * this command(s) to be handled first! */ + io_event_del(My_Connections[i].sock, + IO_WANTREAD); + continue; + } + io_event_add(My_Connections[i].sock, IO_WANTREAD); } @@ -954,7 +783,6 @@ Conn_Handler(void) Log(LOG_NOTICE | LOG_snotice, "Server restarting NOW!"); } /* Conn_Handler */ - /** * Write a text string into the socket of a connection. * @@ -970,7 +798,7 @@ Conn_Handler(void) GLOBAL bool Conn_WriteStr(CONN_ID Idx, const char *Format, ...) #else -GLOBAL bool +GLOBAL bool Conn_WriteStr(Idx, Format, va_alist) CONN_ID Idx; const char *Format; @@ -984,6 +812,7 @@ va_dcl size_t len; bool ok; va_list ap; + int r; assert( Idx > NONE ); assert( Format != NULL ); @@ -993,7 +822,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 @@ -1001,7 +831,7 @@ va_dcl * IRC_WriteXXX() functions when the prefix of this server had * to be added to an already "quite long" command line which * has been received from a regular IRC client, for example. - * + * * We are not allowed to send such "oversized" messages to * other servers and clients, see RFC 2812 2.3 and 2813 3.3 * ("these messages SHALL NOT exceed 512 characters in length, @@ -1014,6 +844,13 @@ va_dcl * 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- */ @@ -1152,7 +989,6 @@ Conn_Write( CONN_ID Idx, char *Data, size_t Len ) return true; } /* Conn_Write */ - /** * Shut down a connection. * @@ -1165,7 +1001,7 @@ Conn_Write( CONN_ID Idx, char *Data, size_t Len ) * 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 asynchronous resolver * sub-processes are closed down. */ @@ -1261,9 +1097,9 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie * 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) + if (in_z_k <= 0) in_z_k = in_k; - if (! out_z_k) + if (out_z_k <= 0) out_z_k = out_k; in_p = (int)(( in_k * 100 ) / in_z_k ); out_p = (int)(( out_k * 100 ) / out_z_k ); @@ -1311,7 +1147,6 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie idle_t = NumConnections > 0 ? 0 : time(NULL); } /* Conn_Close */ - /** * Get current number of connections. * @@ -1323,7 +1158,6 @@ Conn_Count(void) return NumConnections; } /* Conn_Count */ - /** * Get number of maximum simultaneous connections. * @@ -1335,7 +1169,6 @@ Conn_CountMax(void) return NumConnectionsMax; } /* Conn_CountMax */ - /** * Get number of connections accepted since the daemon startet. * @@ -1347,7 +1180,6 @@ 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. @@ -1379,7 +1211,6 @@ Conn_SyncServerStruct(void) } } /* SyncServerStruct */ - /** * Get IP address string of a connection. * @@ -1393,7 +1224,6 @@ Conn_GetIPAInfo(CONN_ID Idx) return ng_ipaddr_tostr(&My_Connections[Idx].addr); } - /** * Send out data of write buffer; connect new sockets. * @@ -1433,7 +1263,7 @@ Handle_Write( CONN_ID Idx ) return true; } -#ifdef DEBUG_BUFFER +#if DEBUG_BUFFER LogDebug ("Handle_Write() called for connection %d, %ld bytes pending ...", Idx, wdatalen); @@ -1441,7 +1271,9 @@ Handle_Write( CONN_ID Idx ) #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 { @@ -1452,6 +1284,9 @@ Handle_Write( CONN_ID Idx ) if (errno == EAGAIN || errno == EINTR) return true; + /* Log write errors but do not close the connection yet. + * Calling Conn_Close() now could result in too many recursive calls. + */ if (!Conn_OPTION_ISSET(&My_Connections[Idx], CONN_ISCLOSING)) Log(LOG_ERR, "Write error on connection %d (socket %d): %s!", @@ -1459,7 +1294,7 @@ Handle_Write( CONN_ID Idx ) 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; } @@ -1469,7 +1304,6 @@ Handle_Write( CONN_ID Idx ) return true; } /* Handle_Write */ - /** * Count established connections to a specific IP address. * @@ -1490,7 +1324,6 @@ Count_Connections(ng_ipaddr_t *a) return cnt; } /* Count_Connections */ - /** * Initialize new client connection on a listening socket. * @@ -1550,8 +1383,8 @@ New_Connection(int Sock, UNUSED bool IsSSL) /* 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); + Log(LOG_ALERT, "Can't accept new connection on socket %d: Limit (%d) reached!", + Sock, Conf_MaxConnections); Simple_Message(new_sock, "ERROR :Connection limit reached"); close(new_sock); return -1; @@ -1570,23 +1403,10 @@ New_Connection(int Sock, UNUSED bool IsSSL) return -1; } - 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; - } - 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 = array_start(&My_ConnArray); - while (Pool_Size <= new_sock) - Init_Conn_Struct(Pool_Size++); + if (Socket2Index(new_sock) <= NONE) { + Simple_Message(new_sock, "ERROR: Internal error"); + close(new_sock); + return -1; } /* register callback */ @@ -1637,7 +1457,6 @@ New_Connection(int Sock, UNUSED bool IsSSL) return new_sock; } /* New_Connection */ - /** * Finish connection initialization, start resolver subprocess. * @@ -1660,16 +1479,16 @@ Conn_StartLogin(CONN_ID Idx) ident_sock = My_Connections[Idx].sock; #endif - if (Conf_NoticeAuth) { - /* Send "NOTICE AUTH" messages to the client */ + if (Conf_NoticeBeforeRegistration) { + /* Send "NOTICE *" messages to the client */ #ifdef IDENTAUTH if (Conf_Ident) (void)Conn_WriteStr(Idx, - "NOTICE AUTH :*** Looking up your hostname and checking ident"); + "NOTICE * :*** Looking up your hostname and checking ident"); else #endif (void)Conn_WriteStr(Idx, - "NOTICE AUTH :*** Looking up your hostname"); + "NOTICE * :*** 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! */ @@ -1681,7 +1500,6 @@ Conn_StartLogin(CONN_ID Idx) ident_sock, cb_Read_Resolver_Result); } - /** * Update global connection counters. */ @@ -1696,27 +1514,39 @@ Account_Connection(void) NumConnections, NumConnectionsMax); } /* Account_Connection */ - /** - * Translate socket handle into connection index. + * Translate socket handle into connection index (for historical reasons, it is + * a 1:1 mapping today) and enlarge the "connection pool" accordingly. * * @param Sock Socket handle. - * @returns Connecion index or NONE, if no connection could be found. + * @returns Connecion index or NONE when the pool is too small. */ static CONN_ID Socket2Index( int Sock ) { - assert( Sock >= 0 ); + assert(Sock > 0); + assert(Pool_Size >= 0); + + if (Sock < Pool_Size) + return Sock; - 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); + /* Try to allocate more memory ... */ + if (!array_alloc(&My_ConnArray, sizeof(CONNECTION), (size_t)Sock)) { + Log(LOG_EMERG, + "Can't allocate memory to enlarge connection pool!"); return NONE; } - return Sock; -} /* Socket2Index */ + LogDebug("Enlarged connection pool for %ld sockets (%ld items, %ld bytes)", + Sock, array_length(&My_ConnArray, sizeof(CONNECTION)), + array_bytes(&My_ConnArray)); + /* Adjust pointer to new block, update size and initialize new items. */ + My_Connections = array_start(&My_ConnArray); + while (Pool_Size <= Sock) + Init_Conn_Struct(Pool_Size++); + + return Sock; +} /** * Read data from the network to the read buffer. If an error occurs, @@ -1725,16 +1555,21 @@ Socket2Index( int Sock ) * @param Idx Connection index. */ static void -Read_Request( CONN_ID Idx ) +Read_Request(CONN_ID Idx) { 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 ); + assert(Idx > NONE); + assert(My_Connections[Idx].sock > NONE); + + /* Check if the read buffer is "full". Basically this shouldn't happen + * here, because as long as there possibly are commands in the read + * buffer (buffer usage > COMMAND_LEN), the socket shouldn't be + * scheduled for reading in Conn_Handler() at all ... */ #ifdef ZLIB if ((array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN) || (array_bytes(&My_Connections[Idx].zip.rbuf) >= READBUFFER_LEN)) @@ -1742,36 +1577,44 @@ Read_Request( CONN_ID Idx ) if (array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN) #endif { - /* Read buffer is full */ Log(LOG_ERR, - "Receive buffer space exhausted (connection %d): %d bytes", - Idx, array_bytes(&My_Connections[Idx].rbuf)); + "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; } + /* Now read new data from the network, up to READBUFFER_LEN bytes ... */ #ifdef SSL_SUPPORT if (Conn_OPTION_ISSET(&My_Connections[Idx], CONN_SSL)) - len = ConnSSL_Read( &My_Connections[Idx], readbuf, sizeof(readbuf)); + len = ConnSSL_Read(&My_Connections[Idx], readbuf, sizeof(readbuf)); else #endif - len = read(My_Connections[Idx].sock, readbuf, sizeof(readbuf)); + 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); + ng_ipaddr_getport(&My_Connections[Idx].addr), Idx); Conn_Close(Idx, NULL, "Client closed connection", false); return; } if (len < 0) { - if( errno == EAGAIN ) return; + 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); return; } + + /* Now append the newly received data to the connection buffer. + * NOTE: This can lead to connection read buffers being bigger(!) than + * READBUFFER_LEN bytes, as we add up to READBUFFER_LEN new bytes to a + * buffer possibly being "almost" READBUFFER_LEN bytes already! */ #ifdef ZLIB if (Conn_OPTION_ISSET(&My_Connections[Idx], CONN_ZIP)) { if (!array_catb(&My_Connections[Idx].zip.rbuf, readbuf, @@ -1790,12 +1633,15 @@ Read_Request( CONN_ID Idx ) 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 ); + 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 */ @@ -1821,17 +1667,10 @@ 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. * @@ -1873,7 +1712,12 @@ Handle_Buffer(CONN_ID Idx) 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; } for (i=0; i < maxcmd; i++) { @@ -1970,10 +1814,6 @@ Handle_Buffer(CONN_ID Idx) return 0; /* error -> connection has been closed */ 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)) { @@ -1996,10 +1836,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, @@ -2058,7 +1908,6 @@ Check_Connections(void) } } /* Check_Connections */ - /** * Check if further server links should be established. */ @@ -2074,7 +1923,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 */ @@ -2101,12 +1950,14 @@ Check_Servers(void) 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); + + /* Start resolver subprocess ... */ + if (!Resolve_Name(&Conf_Server[i].res_stat, Conf_Server[i].host, + cb_Connect_to_Server)) + Conf_Server[i].conn_id = NONE; } } /* Check_Servers */ - /** * Establish a new outgoing server connection. * @@ -2159,12 +2010,15 @@ New_Server( int Server , ng_ipaddr_t *dest) /* 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)); @@ -2175,24 +2029,20 @@ New_Server( int Server , ng_ipaddr_t *dest) return; } - if (!array_alloc(&My_ConnArray, sizeof(CONNECTION), (size_t)new_sock)) { - Log(LOG_ALERT, - "Cannot allocate memory for server connection (socket %d)", - new_sock); + if (Socket2Index(new_sock) <= NONE) { 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)); + Log(LOG_ALERT, "io_event_create(): could not add fd %d", + strerror(errno)); close(new_sock); Conf_Server[Server].conn_id = NONE; return; } - My_Connections = array_start(&My_ConnArray); - assert(My_Connections[new_sock].sock <= 0); Init_Conn_Struct(new_sock); @@ -2221,12 +2071,13 @@ New_Server( int Server , ng_ipaddr_t *dest) sizeof(My_Connections[new_sock].host )); #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; } @@ -2236,7 +2087,6 @@ New_Server( int Server , ng_ipaddr_t *dest) Conn_OPTION_ADD( &My_Connections[new_sock], CONN_ISCONNECTING ); } /* New_Server */ - /** * Initialize connection structure. * @@ -2260,7 +2110,6 @@ Init_Conn_Struct(CONN_ID Idx) #endif } /* Init_Conn_Struct */ - /** * Initialize options of a new socket. * @@ -2276,16 +2125,18 @@ Init_Socket( int Sock ) 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 */ } @@ -2305,7 +2156,6 @@ Init_Socket( int Sock ) return true; } /* Init_Socket */ - /** * Read results of a resolver sub-process and try to initiate a new server * connection. @@ -2316,15 +2166,16 @@ Init_Socket( int Sock ) 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 ) @@ -2349,7 +2200,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)) { @@ -2367,7 +2219,6 @@ 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. @@ -2431,9 +2282,9 @@ 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) + if (Conf_NoticeBeforeRegistration) (void)Conn_WriteStr(i, - "NOTICE AUTH :*** Found your hostname: %s", + "NOTICE * :*** Found your hostname: %s", My_Connections[i].host); #ifdef IDENTAUTH ++identptr; @@ -2457,22 +2308,22 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) i, identptr); Client_SetUser(c, identptr, true); } - if (Conf_NoticeAuth) { + if (Conf_NoticeBeforeRegistration) { (void)Conn_WriteStr(i, - "NOTICE AUTH :*** Got %sident response%s%s", + "NOTICE * :*** 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) + if (Conf_NoticeBeforeRegistration) (void)Conn_WriteStr(i, - "NOTICE AUTH :*** No ident response"); + "NOTICE * :*** No ident response"); } #endif - if (Conf_NoticeAuth) { + if (Conf_NoticeBeforeRegistration) { /* Send buffered data to the client, but break on * errors because Handle_Write() would have closed * the connection again in this case! */ @@ -2488,7 +2339,6 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) #endif } /* cb_Read_Resolver_Result */ - /** * Write a "simple" (error) message to a socket. * @@ -2522,7 +2372,6 @@ 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 @@ -2532,7 +2381,7 @@ Simple_Message(int Sock, const char *Msg) * @returns Pointer to CLIENT structure. */ GLOBAL CLIENT * -Conn_GetClient( CONN_ID Idx ) +Conn_GetClient( CONN_ID Idx ) { CONNECTION *c; @@ -2559,7 +2408,6 @@ Conn_GetProcStat(CONN_ID Idx) return &c->proc_stat; } /* Conn_GetProcStat */ - /** * Get CONN_ID from file descriptor associated to a subprocess structure. * @@ -2580,6 +2428,35 @@ 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 Value 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 @@ -2597,11 +2474,140 @@ Conn_SetAuthPing(CONN_ID Idx, long ID) My_Connections[Idx].auth_ping = ID; } /* Conn_SetAuthPing */ -#endif - +#endif /* STRICT_RFC */ #ifdef SSL_SUPPORT +/** + * 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); + + if (idx <= NONE) { + 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); + + (void) unused; + + if (idx <= NONE) { + io_close(sock); + return; + } + + 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. * @@ -2619,7 +2625,6 @@ 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. * @@ -2635,7 +2640,6 @@ Conn_UsesSSL(CONN_ID Idx) return Conn_OPTION_ISSET(&My_Connections[Idx], CONN_SSL); } - GLOBAL char * Conn_GetCertFp(CONN_ID Idx) { @@ -2645,7 +2649,6 @@ Conn_GetCertFp(CONN_ID Idx) return ConnSSL_GetCertFp(&My_Connections[Idx]); } - GLOBAL bool Conn_SetCertFp(CONN_ID Idx, const char *fingerprint) { @@ -2654,28 +2657,28 @@ Conn_SetCertFp(CONN_ID Idx, const char *fingerprint) assert(Idx < (int) array_length(&My_ConnArray, sizeof(CONNECTION))); return ConnSSL_SetCertFp(&My_Connections[Idx], fingerprint); } -#else + +#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 +#endif /* SSL_SUPPORT */ #ifdef DEBUG @@ -2701,7 +2704,6 @@ Conn_DebugDump(void) } } /* Conn_DumpClients */ -#endif - +#endif /* DEBUG */ /* -eof- */