X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fconn.c;h=c304fdb574ffc497552f76fec4c531bb5c359abe;hb=387a29a7fdbf00f5d792ba1450c608db8670308a;hp=edcd868efba8b30a6113897b6f94df18db18b6b7;hpb=0083fe177f727af6ab43e190e3bea8a94555348e;p=ngircd.git diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index edcd868e..c304fdb5 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2014 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 @@ -10,6 +10,7 @@ */ #define CONN_MODULE +#define CONN_MODULE_GLOBAL_INIT #include "portab.h" @@ -182,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; } @@ -280,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))) { @@ -307,32 +306,20 @@ cb_clientserver(int sock, short what) 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 */ /** @@ -570,8 +557,8 @@ InitSinaddrListenAddr(ng_ipaddr_t *addr, const char *listen_addrstr, UINT16 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); + "Can't listen on [%s]:%u: Failed to parse IP address!", + listen_addrstr, Port); } return ret; } @@ -673,9 +660,14 @@ Conn_Handler(void) size_t wdatalen; struct timeval tv; time_t t; + bool command_available; + + Log(LOG_NOTICE, "Server \"%s\" (on \"%s\") ready.", + Client_ID(Client_ThisServer()), Client_Hostname(Client_ThisServer())); while (!NGIRCd_SignalQuit && !NGIRCd_SignalRestart) { t = time(NULL); + command_available = false; /* Check configured servers and established links */ Check_Servers(); @@ -744,16 +736,31 @@ 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); + command_available = true; + continue; + } + io_event_add(My_Connections[i].sock, IO_WANTREAD); } - /* Set the timeout for reading from the network to 1 second, - * which is the granularity with witch we handle "penalty - * times" for example. + /* Don't wait for data when there is still at least one command + * available in a read buffer which can be handled immediately; + * set the timeout for reading from the network to 1 second + * otherwise, 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 before each call to it! */ tv.tv_usec = 0; - tv.tv_sec = 1; + tv.tv_sec = command_available ? 0 : 1; /* Wait for activity ... */ i = io_dispatch(&tv); @@ -796,7 +803,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; @@ -829,7 +836,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, @@ -1095,9 +1102,9 @@ Conn_Close(CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClien * 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 ); @@ -1282,6 +1289,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!", @@ -1289,7 +1299,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; } @@ -1378,8 +1388,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; @@ -1398,23 +1408,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 */ @@ -1523,24 +1520,38 @@ Account_Connection(void) } /* 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; } + 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; -} /* Socket2Index */ +} /** * Read data from the network to the read buffer. If an error occurs, @@ -1549,16 +1560,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)) @@ -1566,7 +1582,6 @@ 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/%d bytes", Idx, array_bytes(&My_Connections[Idx].rbuf), READBUFFER_LEN); @@ -1574,12 +1589,14 @@ Read_Request( CONN_ID Idx ) 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, @@ -1589,13 +1606,20 @@ Read_Request( CONN_ID Idx ) } 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, @@ -1931,8 +1955,11 @@ 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 */ @@ -2007,10 +2034,7 @@ 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; @@ -2024,8 +2048,6 @@ New_Server( int Server , ng_ipaddr_t *dest) return; } - My_Connections = array_start(&My_ConnArray); - assert(My_Connections[new_sock].sock <= 0); Init_Conn_Struct(new_sock); @@ -2364,7 +2386,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; @@ -2417,7 +2439,7 @@ Conn_GetFromProc(int fd) * @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. + * @param Value The time to delay this connection. */ static void Throttle_Connection(const CONN_ID Idx, CLIENT *Client, const int Reason, @@ -2472,9 +2494,7 @@ cb_clientserver_ssl(int sock, UNUSED short what) { CONN_ID idx = Socket2Index(sock); - assert(idx >= 0); - - if (idx < 0) { + if (idx <= NONE) { io_close(sock); return; } @@ -2524,12 +2544,13 @@ cb_connserver_login_ssl(int sock, short unused) { CONN_ID idx = Socket2Index(sock); - assert(idx >= 0); - if (idx < 0) { + (void) unused; + + if (idx <= NONE) { io_close(sock); return; } - (void) unused; + switch (ConnSSL_Connect( &My_Connections[idx])) { case 1: break; case 0: LogDebug("ConnSSL_Connect: not ready");