commit c27d3b08c418c85da917b451fe8780e4159f9854
parent bf9771faf829587c91c834f422140550cb28525a
Author: sin <sin@2f30.org>
Date: Tue, 30 Sep 2014 17:03:25 +0100
Call fiforeset() if we fail to initiate the transfer
Diffstat:
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/ratox.c b/ratox.c
@@ -164,7 +164,6 @@ static Tox *tox;
static Tox_Options toxopt;
static uint8_t *passphrase;
static uint32_t pplen;
-static uint8_t toilet[PIPE_BUF];
static volatile sig_atomic_t running = 1;
static int ipv6;
static int tcpflag;
@@ -1263,9 +1262,7 @@ loop(void)
if (tox_new_file_sender(tox, f->num,
0, (uint8_t *)tstamp, strlen(tstamp)) < 0) {
weprintf("Failed to initiate new transfer\n");
- /* Flush the FIFO */
- while (fiforead(f->dirfd, &f->fd[FFILE_IN], ffiles[FFILE_IN],
- toilet, sizeof(toilet)));
+ fiforeset(f->dirfd, &f->fd[FFILE_IN], ffiles[FFILE_IN]);
} else {
f->tx.state = TRANSFER_INITIATED;
printout(": %s : Tx > Initiated\n", f->name);