mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2024-12-12 09:50:29 +00:00
Code Issues Releases Wiki Activity

Increase read buffer size for server connections

Browse Source 
This applies the same logic we have for write buffers to distinguish
between server and client connections and sets the maximum buffer size
accordingly. As a result peering with servers with many GLINE/KLINEs
does not kill the connecting server connection anymore.
This commit is contained in:
michi 2020-04-15 10:32:08 +02:00 committed by Alexander Barton
parent 04de1423eb
commit c6e3c13f27
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ngircd/conn.c
View File

@ -1546,34 +1546,46 @@ static void
Read_Request( CONN_ID Idx ) Read_Request( CONN_ID Idx )
{ {
ssize_t len; ssize_t len;
size_t readbuf_limit = READBUFFER_LEN;
static const unsigned int maxbps = COMMAND_LEN / 2; static const unsigned int maxbps = COMMAND_LEN / 2;
char readbuf[READBUFFER_LEN]; char readbuf[READBUFFER_MAX_LEN];
time_t t; time_t t;
CLIENT *c; CLIENT *c;
assert( Idx > NONE ); assert( Idx > NONE );
assert( My_Connections[Idx].sock > NONE ); assert( My_Connections[Idx].sock > NONE );
/* 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 read buffer limits, so they can
* process all the messages that are required while peering. */
if (Client_Type(c) == CLIENT_SERVER)
readbuf_limit = READBUFFER_SLINK_LEN;
} else
LogDebug("Read request without client (connection %d)!?", Idx);
#ifdef ZLIB #ifdef ZLIB
if ((array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN) || if ((array_bytes(&My_Connections[Idx].rbuf) >= readbuf_limit) ||
(array_bytes(&My_Connections[Idx].zip.rbuf) >= READBUFFER_LEN)) (array_bytes(&My_Connections[Idx].zip.rbuf) >= readbuf_limit))
#else #else
if (array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN) if (array_bytes(&My_Connections[Idx].rbuf) >= readbuf_limit)
#endif #endif
{ {
/* Read buffer is full */ /* Read buffer is full */
Log(LOG_ERR, Log(LOG_ERR,
"Receive buffer space exhausted (connection %d): %d/%d bytes", "Receive buffer space exhausted (connection %d): %d/%d bytes",
Idx, array_bytes(&My_Connections[Idx].rbuf), READBUFFER_LEN); Idx, array_bytes(&My_Connections[Idx].rbuf), readbuf_limit);
Conn_Close(Idx, "Receive buffer space exhausted", NULL, false); Conn_Close(Idx, "Receive buffer space exhausted", NULL, false);
return; return;
} }
#ifdef SSL_SUPPORT #ifdef SSL_SUPPORT
if (Conn_OPTION_ISSET(&My_Connections[Idx], CONN_SSL)) 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, readbuf_limit);
else else
#endif #endif
len = read(My_Connections[Idx].sock, readbuf, sizeof(readbuf)); len = read(My_Connections[Idx].sock, readbuf, readbuf_limit);
if (len == 0) { if (len == 0) {
LogDebug("Client \"%s:%u\" is closing connection %d ...", LogDebug("Client \"%s:%u\" is closing connection %d ...",
My_Connections[Idx].host, My_Connections[Idx].host,

8
src/ngircd/defines.h
View File

@ -153,6 +153,12 @@
/** Size of the read buffer of a connection in bytes. */ /** Size of the read buffer of a connection in bytes. */
#define READBUFFER_LEN 2048 #define READBUFFER_LEN 2048
/** Maximum size of the read buffer of a connection in bytes. */
#define READBUFFER_MAX_LEN 65535
/** Maximum size of the read buffer of a server link connection in bytes. */
#define READBUFFER_SLINK_LEN 65536
/** Size that triggers write buffer flushing if more space is needed. */ /** Size that triggers write buffer flushing if more space is needed. */
#define WRITEBUFFER_FLUSH_LEN 4096 #define WRITEBUFFER_FLUSH_LEN 4096
@ -160,7 +166,7 @@
#define WRITEBUFFER_MAX_LEN 32768 #define WRITEBUFFER_MAX_LEN 32768
/** Maximum size of the write buffer of a server link connection in bytes. */ /** Maximum size of the write buffer of a server link connection in bytes. */
#define WRITEBUFFER_SLINK_LEN 65536 #define WRITEBUFFER_SLINK_LEN READBUFFER_SLINK_LEN
/* IRC/IRC+ protocol */ /* IRC/IRC+ protocol */