zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-18 08:02:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

DCC RESUME, DCC ACCEPT: we might have crashed with invalid parameters.

Browse source 
Some other "cleanups".


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1178 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-02-03 17:38:01 +00:00 • committed by cras
commit 6ad5d24e0d
2 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/irc/dcc/dcc-resume.c
View file

@ -90,11 +90,10 @@ static void ctcp_msg_dcc_resume(IRC_SERVER_REC *server, const char *data,
char *str;
long size;
if (!dcc_ctcp_resume_parse(DCC_TYPE_RESUME, data, nick, &dcc, &size))
if (!dcc_ctcp_resume_parse(DCC_TYPE_RESUME, data, nick, &dcc, &size)) {
signal_emit("dcc error ctcp", 5, "RESUME", data,
nick, addr, target);
if (dcc != NULL && dcc_resume_file_check(dcc, server, size)) {
} else if (dcc != NULL && dcc_resume_file_check(dcc, server, size)) {
str = g_strdup_printf(dcc->file_quoted ?
"DCC ACCEPT \"%s\" %d %lu" :
"DCC ACCEPT %s %d %lu",
@ -114,11 +113,10 @@ static void ctcp_msg_dcc_accept(IRC_SERVER_REC *server, const char *data,
long size;
if (!dcc_ctcp_resume_parse(DCC_TYPE_ACCEPT, data, nick, &dcc, &size) ||
(dcc != NULL && dcc->get_type != DCC_GET_RESUME))
(dcc != NULL && dcc->get_type != DCC_GET_RESUME)) {
signal_emit("dcc error ctcp", 5, "ACCEPT", data,
nick, addr, target);
if (dcc != NULL && dcc_resume_file_check(dcc, server, size))
} else if (dcc != NULL && dcc_resume_file_check(dcc, server, size))
dcc_get_connect(dcc);
}
@ -145,15 +143,15 @@ static void dcc_send_resume(DCC_REC *dcc)
/* already received whole file */
dcc->starttime = time(NULL);
dcc_reject(dcc, NULL);
return;
} else {
str = g_strdup_printf(dcc->file_quoted ?
"DCC RESUME \"%s\" %d %lu" :
"DCC RESUME %s %d %lu",
dcc->arg, dcc->port, dcc->transfd);
dcc_ctcp_message(dcc->server, dcc->nick,
dcc->chat, FALSE, str);
g_free(str);
}
str = g_strdup_printf(dcc->file_quoted ?
"DCC RESUME \"%s\" %d %lu" :
"DCC RESUME %s %d %lu",
dcc->arg, dcc->port, dcc->transfd);
dcc_ctcp_message(dcc->server, dcc->nick, dcc->chat, FALSE, str);
g_free(str);
}
/* SYNTAX: DCC RESUME [<nick> [<file>]] */