tFix file-transfers - ratox - FIFO based tox client
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 0368ab5203e985277c13020317059026c2d3e642
(DIR) parent 0ba8712e314f02f7d09066941d5841adb60c5018
(HTM) Author: sin <sin@2f30.org>
Date: Wed, 8 Oct 2014 19:42:33 +0100
Fix file-transfers
Diffstat:
M ratox.c | 44 ++++++++++++++++---------------
1 file changed, 23 insertions(+), 21 deletions(-)
---
(DIR) diff --git a/ratox.c b/ratox.c
t@@ -149,6 +149,7 @@ static char *ustate[] = {
enum {
TRANSFER_NONE,
TRANSFER_INITIATED,
+ TRANSFER_PENDING,
TRANSFER_INPROGRESS,
TRANSFER_PAUSED,
};
t@@ -881,7 +882,7 @@ cbfilesendreq(Tox *m, int32_t frnum, uint8_t fnum, uint64_t fsz,
ftruncate(f->fd[FFILE_PENDING], 0);
lseek(f->fd[FFILE_PENDING], 0, SEEK_SET);
dprintf(f->fd[FFILE_PENDING], "%s\n", filename);
- f->rxstate = TRANSFER_INPROGRESS;
+ f->rxstate = TRANSFER_PENDING;
printout(": %s : Rx > Pending %s\n", f->name, filename);
}
t@@ -919,32 +920,32 @@ cbfiledata(Tox *m, int32_t frnum, uint8_t fnum, const uint8_t *data, uint16_t le
static void
canceltxtransfer(struct friend *f)
{
- if (f->tx.state != TRANSFER_NONE) {
- printout(": %s : Tx > Cancelling\n", f->name);
- if (tox_file_send_control(tox, f->num, 0, 0, TOX_FILECONTROL_KILL, NULL, 0) < 0)
- weprintf("Failed to kill Tx transfer\n");
- f->tx.state = TRANSFER_NONE;
- free(f->tx.buf);
- f->tx.buf = NULL;
- fiforeset(f->dirfd, &f->fd[FFILE_IN], ffiles[FFILE_IN]);
- }
+ if (f->tx.state == TRANSFER_NONE)
+ return;
+ printout(": %s : Tx > Cancelling\n", f->name);
+ if (tox_file_send_control(tox, f->num, 0, 0, TOX_FILECONTROL_KILL, NULL, 0) < 0)
+ weprintf("Failed to kill Tx transfer\n");
+ f->tx.state = TRANSFER_NONE;
+ free(f->tx.buf);
+ f->tx.buf = NULL;
+ fiforeset(f->dirfd, &f->fd[FFILE_IN], ffiles[FFILE_IN]);
}
static void
cancelrxtransfer(struct friend *f)
{
- if (f->rxstate == TRANSFER_INPROGRESS) {
- printout(": %s : Rx > Cancelling\n", f->name);
- if (tox_file_send_control(tox, f->num, 1, 0, TOX_FILECONTROL_KILL, NULL, 0) < 0)
- weprintf("Failed to kill Rx transfer\n");
- if (f->fd[FFILE_OUT] != -1) {
- close(f->fd[FFILE_OUT]);
- f->fd[FFILE_OUT] = -1;
- }
- ftruncate(f->fd[FFILE_PENDING], 0);
- lseek(f->fd[FFILE_PENDING], 0, SEEK_SET);
- f->rxstate = TRANSFER_NONE;
+ if (f->rxstate == TRANSFER_NONE)
+ return;
+ printout(": %s : Rx > Cancelling\n", f->name);
+ if (tox_file_send_control(tox, f->num, 1, 0, TOX_FILECONTROL_KILL, NULL, 0) < 0)
+ weprintf("Failed to kill Rx transfer\n");
+ if (f->fd[FFILE_OUT] != -1) {
+ close(f->fd[FFILE_OUT]);
+ f->fd[FFILE_OUT] = -1;
}
+ ftruncate(f->fd[FFILE_PENDING], 0);
+ lseek(f->fd[FFILE_PENDING], 0, SEEK_SET);
+ f->rxstate = TRANSFER_NONE;
}
static void
t@@ -1734,6 +1735,7 @@ loop(void)
cancelrxtransfer(f);
} else {
printout(": %s : Rx > Accepted\n", f->name);
+ f->rxstate = TRANSFER_INPROGRESS;
}
}
}