jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #578 from ailin-nemui/dcc_buffer

Browse Source 
add a static buffer for dcc received data
This commit is contained in:
LemonBoy 2016-11-25 21:52:30 +01:00 committed by GitHub
commit 1c0f048d2c
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/irc/dcc/dcc-get.c
View File

@ -30,6 +30,8 @@
#include "dcc-get.h" #include "dcc-get.h"
#include "dcc-send.h" #include "dcc-send.h"
static char *dcc_get_recv_buffer;
GET_DCC_REC *dcc_get_create(IRC_SERVER_REC *server, CHAT_DCC_REC *chat, GET_DCC_REC *dcc_get_create(IRC_SERVER_REC *server, CHAT_DCC_REC *chat,
const char *nick, const char *arg) const char *nick, const char *arg)
{ {
@ -139,14 +141,20 @@ static void sig_dccget_send(GET_DCC_REC *dcc)
dcc_get_send_received(dcc); dcc_get_send_received(dcc);
} }
#define DCC_GET_RECV_BUFFER_SIZE 32768
/* input function: DCC GET received data */ /* input function: DCC GET received data */
static void sig_dccget_receive(GET_DCC_REC *dcc) static void sig_dccget_receive(GET_DCC_REC *dcc)
{ {
char buffer[512];
int ret; int ret;
if (dcc_get_recv_buffer == NULL) {
dcc_get_recv_buffer = g_malloc(DCC_GET_RECV_BUFFER_SIZE);
}
for (;;) { for (;;) {
ret = net_receive(dcc->handle, buffer, sizeof(buffer)); ret = net_receive(dcc->handle, dcc_get_recv_buffer,
DCC_GET_RECV_BUFFER_SIZE);
if (ret == 0) break; if (ret == 0) break;
if (ret < 0) { if (ret < 0) {
@ -156,7 +164,7 @@ static void sig_dccget_receive(GET_DCC_REC *dcc)
return; return;
} }
if (write(dcc->fhandle, buffer, ret) != ret) { if (write(dcc->fhandle, dcc_get_recv_buffer, ret) != ret) {
/* most probably out of disk space */ /* most probably out of disk space */
signal_emit("dcc error write", 2, signal_emit("dcc error write", 2,
dcc, g_strerror(errno)); dcc, g_strerror(errno));
@ -596,4 +604,5 @@ void dcc_get_deinit(void)
signal_remove("dcc destroyed", (SIGNAL_FUNC) sig_dcc_destroyed); signal_remove("dcc destroyed", (SIGNAL_FUNC) sig_dcc_destroyed);
signal_remove("ctcp msg dcc send", (SIGNAL_FUNC) ctcp_msg_dcc_send); signal_remove("ctcp msg dcc send", (SIGNAL_FUNC) ctcp_msg_dcc_send);
command_unbind("dcc get", (SIGNAL_FUNC) cmd_dcc_get); command_unbind("dcc get", (SIGNAL_FUNC) cmd_dcc_get);
g_free_and_null(dcc_get_recv_buffer);
} }