aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Allow increasing the send buffer to 1MB/connection, and warn if that is exceeded.

Browse Source 
It should really close connections that exceed the
limit, but does not do that yet.


git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@4840 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Jilles Tjoelker 2008-05-22 21:42:29 +00:00 committed by jilles
parent ba80576b1e
commit 9f99376a8a
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/net-sendbuffer.c
View File

@ -37,6 +37,7 @@ NET_SENDBUF_REC *net_sendbuffer_create(GIOChannel *handle, int bufsize)
rec->send_tag = -1; rec->send_tag = -1;
rec->handle = handle; rec->handle = handle;
rec->bufsize = bufsize > 0 ? bufsize : DEFAULT_BUFFER_SIZE; rec->bufsize = bufsize > 0 ? bufsize : DEFAULT_BUFFER_SIZE;
rec->def_bufsize = rec->bufsize;
buffers = g_slist_append(buffers, rec); buffers = g_slist_append(buffers, rec);
return rec; return rec;
@ -61,7 +62,9 @@ static int buffer_send(NET_SENDBUF_REC *rec)
ret = net_transmit(rec->handle, rec->buffer, rec->bufpos); ret = net_transmit(rec->handle, rec->buffer, rec->bufpos);
if (ret < 0 || rec->bufpos == ret) { if (ret < 0 || rec->bufpos == ret) {
/* error/all sent - don't try to send it anymore */ /* error/all sent - don't try to send it anymore */
g_free_and_null(rec->buffer); rec->bufsize = rec->def_bufsize;
rec->buffer = g_realloc(rec->buffer, rec->bufsize);
rec->bufpos = 0;
return TRUE; return TRUE;
} }
@ -91,8 +94,16 @@ static int buffer_add(NET_SENDBUF_REC *rec, const void *data, int size)
rec->bufpos = 0; rec->bufpos = 0;
} }
if (rec->bufpos+size > rec->bufsize) while (rec->bufpos+size > rec->bufsize) {
return FALSE; if (rec->bufsize >= MAX_BUFFER_SIZE) {
if (!rec->dead)
g_warning("Dropping some data on an outgoing connection");
rec->dead = 1;
return FALSE;
}
rec->bufsize *= 2;
rec->buffer = g_realloc(rec->buffer, rec->bufsize);
}
memcpy(rec->buffer+rec->bufpos, data, size); memcpy(rec->buffer+rec->bufpos, data, size);
rec->bufpos += size; rec->bufpos += size;
@ -110,7 +121,7 @@ int net_sendbuffer_send(NET_SENDBUF_REC *rec, const void *data, int size)
g_return_val_if_fail(data != NULL, -1); g_return_val_if_fail(data != NULL, -1);
if (size <= 0) return 0; if (size <= 0) return 0;
if (rec->buffer == NULL) { if (rec->buffer == NULL || rec->bufpos == 0) {
/* nothing in buffer - transmit immediately */ /* nothing in buffer - transmit immediately */
ret = net_transmit(rec->handle, data, size); ret = net_transmit(rec->handle, data, size);
if (ret < 0) return -1; if (ret < 0) return -1;

3
src/core/net-sendbuffer.h
View File

@ -2,6 +2,7 @@
#define __NET_SENDBUFFER_H #define __NET_SENDBUFFER_H
#define DEFAULT_BUFFER_SIZE 8192 #define DEFAULT_BUFFER_SIZE 8192
#define MAX_BUFFER_SIZE 1048576
struct _NET_SENDBUF_REC { struct _NET_SENDBUF_REC {
GIOChannel *handle; GIOChannel *handle;
@ -10,6 +11,8 @@ struct _NET_SENDBUF_REC {
int bufsize; int bufsize;
int bufpos; int bufpos;
char *buffer; /* Buffer is NULL until it's actually needed. */ char *buffer; /* Buffer is NULL until it's actually needed. */
int def_bufsize;
unsigned int dead:1;
}; };
/* Create new buffer - if `bufsize' is zero or less, DEFAULT_BUFFER_SIZE /* Create new buffer - if `bufsize' is zero or less, DEFAULT_BUFFER_SIZE