X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconn.c;h=4dfe62fbdb85935030dc3112032baee6668ba9ff;hp=9c6baef2676dd35aab47eaca13b8bf3ef39946f5;hb=f547981188a28844068e864dc1ed955ff173d216;hpb=1254d315b9d33010035aaf7eba61ac4e8e1cc98f diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 9c6baef2..4dfe62fb 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-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 @@ -9,20 +9,18 @@ * Please read the file COPYING, README and AUTHORS for more information. */ -#undef DEBUG_BUFFER - #define CONN_MODULE #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 +32,9 @@ #include #include #include +#include #include -#include +#include #include #include #include @@ -51,39 +50,29 @@ # 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) +#define SERVER_WAIT (NONE - 1) /** "Wait for outgoing connection" flag */ -#define MAX_COMMANDS 3 -#define MAX_COMMANDS_SERVER_MIN 10 -#define MAX_COMMANDS_SERVICE 10 - -#define SD_LISTEN_FDS_START 3 +#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 SD_LISTEN_FDS_START 3 /** systemd(8) socket activation offset */ static bool Handle_Write PARAMS(( CONN_ID Idx )); static bool Conn_Write PARAMS(( CONN_ID Idx, char *Data, size_t Len )); @@ -100,7 +89,6 @@ 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 array My_Listeners; static array My_ConnArray; static size_t NumConnections, NumConnectionsMax, NumConnectionsAccepted; @@ -114,6 +102,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,12 +114,11 @@ static void cb_clientserver PARAMS((int sock, short what)); time_t idle_t = 0; - /** * 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, becaus the sockets will be + * 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. * @@ -152,12 +142,13 @@ my_sd_listen_fds(void) if (!e || !*e) return -1; count = atoi(e); +#ifdef HAVE_UNSETENV unsetenv("LISTEN_FDS"); +#endif return count; } - /** * IO callback for listening sockets: handle new connections. This callback * gets called when a new non-SSL connection should be accepted. @@ -172,29 +163,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. * @@ -222,7 +190,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; } @@ -273,7 +241,6 @@ cb_connserver(int sock, UNUSED short what) server_login(idx); } - /** * Login to a remote server. * @@ -291,46 +258,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. @@ -364,52 +296,14 @@ 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 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)) @@ -436,7 +330,6 @@ Conn_Init( void ) Init_Conn_Struct(i); } /* Conn_Init */ - /** * Clean up connection module. */ @@ -461,7 +354,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 @@ -479,7 +371,6 @@ Conn_CloseAllSockets(int ExceptOf) } } - /** * Initialize listening ports. * @@ -518,7 +409,6 @@ Init_Listeners(array *a, const char *listen_addr, void (*func)(int,short)) return created; } - /** * Initialize all listening sockets. * @@ -548,15 +438,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; @@ -626,7 +519,6 @@ Conn_InitListeners( void ) return created; } /* Conn_InitListeners */ - /** * Shut down all listening sockets. */ @@ -656,7 +548,6 @@ Conn_ExitListeners( void ) array_free(&My_Listeners); } /* Conn_ExitListeners */ - /** * Bind a socket to a specific (source) address. * @@ -673,13 +564,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 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, @@ -705,7 +596,6 @@ set_v6_only(int af, int sock) #endif } - /** * Initialize new listening port. * @@ -762,67 +652,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. * @@ -836,7 +665,7 @@ GLOBAL void Conn_Handler(void) { int i; - unsigned int wdatalen, bytes_processed; + size_t wdatalen, bytes_processed; struct timeval tv; time_t t; @@ -874,7 +703,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) @@ -882,8 +711,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); } @@ -895,7 +726,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 @@ -923,7 +756,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; @@ -953,7 +786,6 @@ Conn_Handler(void) Log(LOG_NOTICE | LOG_snotice, "Server restarting NOW!"); } /* Conn_Handler */ - /** * Write a text string into the socket of a connection. * @@ -983,6 +815,7 @@ va_dcl size_t len; bool ok; va_list ap; + int r; assert( Idx > NONE ); assert( Format != NULL ); @@ -992,7 +825,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 @@ -1008,11 +842,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- */ @@ -1151,7 +992,6 @@ Conn_Write( CONN_ID Idx, char *Data, size_t Len ) return true; } /* Conn_Write */ - /** * Shut down a connection. * @@ -1164,7 +1004,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. */ @@ -1182,8 +1022,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; } @@ -1229,7 +1069,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 @@ -1310,7 +1150,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. * @@ -1322,7 +1161,6 @@ Conn_Count(void) return NumConnections; } /* Conn_Count */ - /** * Get number of maximum simultaneous connections. * @@ -1334,7 +1172,6 @@ Conn_CountMax(void) return NumConnectionsMax; } /* Conn_CountMax */ - /** * Get number of connections accepted since the daemon startet. * @@ -1346,7 +1183,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. @@ -1378,7 +1214,6 @@ Conn_SyncServerStruct(void) } } /* SyncServerStruct */ - /** * Get IP address string of a connection. * @@ -1392,7 +1227,6 @@ Conn_GetIPAInfo(CONN_ID Idx) return ng_ipaddr_tostr(&My_Connections[Idx].addr); } - /** * Send out data of write buffer; connect new sockets. * @@ -1432,7 +1266,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); @@ -1440,7 +1274,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 { @@ -1451,9 +1287,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; } @@ -1463,7 +1304,6 @@ Handle_Write( CONN_ID Idx ) return true; } /* Handle_Write */ - /** * Count established connections to a specific IP address. * @@ -1484,7 +1324,6 @@ Count_Connections(ng_ipaddr_t *a) return cnt; } /* Count_Connections */ - /** * Initialize new client connection on a listening socket. * @@ -1631,7 +1470,6 @@ New_Connection(int Sock, UNUSED bool IsSSL) return new_sock; } /* New_Connection */ - /** * Finish connection initialization, start resolver subprocess. * @@ -1664,14 +1502,17 @@ Conn_StartLogin(CONN_ID Idx) #endif (void)Conn_WriteStr(Idx, "NOTICE AUTH :*** Looking up your hostname"); - (void)Handle_Write(Idx); + /* 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. */ @@ -1686,7 +1527,6 @@ Account_Connection(void) NumConnections, NumConnectionsMax); } /* Account_Connection */ - /** * Translate socket handle into connection index. * @@ -1707,9 +1547,8 @@ 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. @@ -1780,7 +1619,8 @@ 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 ); } } @@ -1821,7 +1661,6 @@ Read_Request( CONN_ID Idx ) } } /* Read_Request */ - /** * Handle all data in the connection read-buffer. * @@ -1858,7 +1697,7 @@ Handle_Buffer(CONN_ID Idx) maxcmd = (int)(Client_UserCount() / 5) + MAX_COMMANDS_SERVER_MIN; /* Allow servers to handle even more commands while peering - * to speed up server login and network synchronisation. */ + * to speed up server login and network synchronization. */ if (Conn_LastPing(Idx) == 0) maxcmd *= 5; break; @@ -1905,7 +1744,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 */ @@ -1960,10 +1799,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)) { @@ -1986,10 +1821,15 @@ 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 + 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, @@ -2048,7 +1888,6 @@ Check_Connections(void) } } /* Check_Connections */ - /** * Check if further server links should be established. */ @@ -2096,7 +1935,6 @@ Check_Servers(void) } } /* Check_Servers */ - /** * Establish a new outgoing server connection. * @@ -2123,6 +1961,7 @@ New_Server( int Server , ng_ipaddr_t *dest) 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; } @@ -2137,26 +1976,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; } @@ -2165,12 +2011,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)); + Log(LOG_ALERT, "io_event_create(): could not add fd %d", + strerror(errno)); close(new_sock); + Conf_Server[Server].conn_id = NONE; return; } @@ -2185,6 +2034,7 @@ New_Server( int Server , ng_ipaddr_t *dest) if (!c) { Log( LOG_ALERT, "Can't establish connection: can't create client structure!" ); io_close(new_sock); + Conf_Server[Server].conn_id = NONE; return; } @@ -2203,12 +2053,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; } @@ -2218,7 +2069,6 @@ New_Server( int Server , ng_ipaddr_t *dest) Conn_OPTION_ADD( &My_Connections[new_sock], CONN_ISCONNECTING ); } /* New_Server */ - /** * Initialize connection structure. * @@ -2242,7 +2092,6 @@ Init_Conn_Struct(CONN_ID Idx) #endif } /* Init_Conn_Struct */ - /** * Initialize options of a new socket. * @@ -2258,16 +2107,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 */ } @@ -2287,7 +2138,6 @@ Init_Socket( int Sock ) return true; } /* Init_Socket */ - /** * Read results of a resolver sub-process and try to initiate a new server * connection. @@ -2298,15 +2148,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 ) @@ -2331,7 +2182,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)) { @@ -2349,10 +2201,9 @@ 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 - * apropriate connection/client structure(s): hostname and/or IDENT user name. + * 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) @@ -2446,25 +2297,30 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) *ptr ? "" : ": ", *ptr ? "" : identptr); } - } else { + } else if(Conf_Ident) { Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i); - if (Conf_NoticeAuth && Conf_Ident) + if (Conf_NoticeAuth) (void)Conn_WriteStr(i, "NOTICE AUTH :*** No ident response"); } #endif - if (Conf_NoticeAuth) - (void)Handle_Write(i); + 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. * @@ -2498,7 +2354,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 @@ -2535,7 +2390,6 @@ Conn_GetProcStat(CONN_ID Idx) return &c->proc_stat; } /* Conn_GetProcStat */ - /** * Get CONN_ID from file descriptor associated to a subprocess structure. * @@ -2573,13 +2427,143 @@ Conn_SetAuthPing(CONN_ID Idx, long ID) My_Connections[Idx].auth_ping = ID; } /* Conn_SetAuthPing */ -#endif - +#endif /* STRICT_RFC */ #ifdef SSL_SUPPORT /** - * Get information about used SSL chiper. + * 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. @@ -2595,7 +2579,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. * @@ -2611,47 +2594,45 @@ Conn_UsesSSL(CONN_ID Idx) return Conn_OPTION_ISSET(&My_Connections[Idx], CONN_SSL); } - GLOBAL char * -Conn_GetFingerprint(CONN_ID Idx) +Conn_GetCertFp(CONN_ID Idx) { if (Idx < 0) return NULL; assert(Idx < (int) array_length(&My_ConnArray, sizeof(CONNECTION))); - return ConnSSL_GetFingerprint(&My_Connections[Idx]); + return ConnSSL_GetCertFp(&My_Connections[Idx]); } - GLOBAL bool -Conn_SetFingerprint(CONN_ID Idx, const char *fingerprint) +Conn_SetCertFp(CONN_ID Idx, const char *fingerprint) { if (Idx < 0) return false; assert(Idx < (int) array_length(&My_ConnArray, sizeof(CONNECTION))); - return ConnSSL_SetFingerprint(&My_Connections[Idx], fingerprint); + return ConnSSL_SetCertFp(&My_Connections[Idx], fingerprint); } -#else + +#else /* SSL_SUPPORT */ + GLOBAL bool Conn_UsesSSL(UNUSED CONN_ID Idx) { return false; } - GLOBAL char * -Conn_GetFingerprint(UNUSED CONN_ID Idx) +Conn_GetCertFp(UNUSED CONN_ID Idx) { return NULL; } - GLOBAL bool -Conn_SetFingerprint(UNUSED CONN_ID Idx, UNUSED const char *fingerprint) +Conn_SetCertFp(UNUSED CONN_ID Idx, UNUSED const char *fingerprint) { return true; } -#endif +#endif /* SSL_SUPPORT */ #ifdef DEBUG @@ -2677,7 +2658,6 @@ Conn_DebugDump(void) } } /* Conn_DumpClients */ -#endif - +#endif /* DEBUG */ /* -eof- */