#include "client.h"
static void killfilter(struct transfer *transfer);
+static int transferread(struct socket *sk, struct transfer *transfer);
+static int transferwrite(struct socket *sk, struct transfer *transfer);
+static int transfererr(struct socket *sk, int errno, struct transfer *transfer);
+static int filterread(struct socket *sk, struct transfer *transfer);
unsigned long long bytesupload = 0;
unsigned long long bytesdownload = 0;
free(transfer->exitstatus);
if(transfer->localend != NULL)
{
- transfer->localend->readcb = NULL;
- transfer->localend->writecb = NULL;
- transfer->localend->errcb = NULL;
+ CBUNREG(transfer->localend, socket_read, transferread, transfer);
+ CBUNREG(transfer->localend, socket_write, transferwrite, transfer);
+ CBUNREG(transfer->localend, socket_err, transfererr, transfer);
putsock(transfer->localend);
}
if(transfer->filterout != NULL)
{
- transfer->filterout->readcb = NULL;
- transfer->filterout->writecb = NULL;
- transfer->filterout->errcb = NULL;
+ CBUNREG(transfer->filterout, socket_read, filterread, transfer);
putsock(transfer->filterout);
}
if(transfer->fn != NULL)
transfer->timeout = 0;
}
-static void transferread(struct socket *sk, struct transfer *transfer)
+static int transferread(struct socket *sk, struct transfer *transfer)
{
if(sockgetdatalen(sk) >= 65536)
sk->ignread = 1;
if((transfer->iface != NULL) && (transfer->iface->gotdata != NULL))
transfer->iface->gotdata(transfer, transfer->ifacedata);
+ return(0);
}
-static void transferwrite(struct socket *sk, struct transfer *transfer)
+static int transferwrite(struct socket *sk, struct transfer *transfer)
{
if((transfer->iface != NULL) && (transfer->iface->wantdata != NULL))
transfer->iface->wantdata(transfer, transfer->ifacedata);
+ return(0);
}
-static void transfererr(struct socket *sk, int errno, struct transfer *transfer)
+static int transfererr(struct socket *sk, int errno, struct transfer *transfer)
{
if((transfer->iface != NULL) && (transfer->iface->endofdata != NULL))
transfer->iface->endofdata(transfer, transfer->ifacedata);
+ return(0);
}
void transferputdata(struct transfer *transfer, void *buf, size_t size)
if(transfer->curpos >= transfer->size)
{
transfersetstate(transfer, TRNS_DONE);
- transfer->localend->readcb = NULL;
- transfer->localend->writecb = NULL;
- transfer->localend->errcb = NULL;
+ CBUNREG(transfer->localend, socket_read, transferread, transfer);
+ CBUNREG(transfer->localend, socket_write, transferwrite, transfer);
+ CBUNREG(transfer->localend, socket_err, transfererr, transfer);
putsock(transfer->localend);
transfer->localend = NULL;
} else {
if(transfer->localend != NULL)
putsock(transfer->localend);
getsock(transfer->localend = sk);
- sk->data = transfer;
- sk->readcb = (void (*)(struct socket *, void *))transferread;
- sk->writecb = (void (*)(struct socket *, void *))transferwrite;
- sk->errcb = (void (*)(struct socket *, int, void *))transfererr;
+ CBREG(sk, socket_read, (int (*)(struct socket *, void *))transferread, NULL, transfer);
+ CBREG(sk, socket_write, (int (*)(struct socket *, void *))transferwrite, NULL, transfer);
+ CBREG(sk, socket_err, (int (*)(struct socket *, int, void *))transfererr, NULL, transfer);
}
static int tryreq(struct transfer *transfer)
}
if(transfer->localend)
{
- transfer->localend->readcb = NULL;
- transfer->localend->writecb = NULL;
- transfer->localend->errcb = NULL;
+ CBUNREG(transfer->localend, socket_read, transferread, transfer);
+ CBUNREG(transfer->localend, socket_write, transferwrite, transfer);
+ CBUNREG(transfer->localend, socket_err, transfererr, transfer);
putsock(transfer->localend);
transfer->localend = NULL;
}
if(transfer->filterout)
{
- transfer->filterout->readcb = NULL;
+ CBUNREG(transfer->filterout, socket_read, filterread, transfer);
putsock(transfer->filterout);
transfer->filterout = NULL;
}
}
}
-static void filterread(struct socket *sk, struct transfer *transfer)
+static int filterread(struct socket *sk, struct transfer *transfer)
{
char *buf, *p, *p2;
size_t bufsize;
wchar_t *cmd, *arg;
if((buf = sockgetinbuf(sk, &bufsize)) == NULL)
- return;
+ return(0);
bufcat(transfer->filterbuf, buf, bufsize);
free(buf);
while((p = memchr(transfer->filterbuf, '\n', transfer->filterbufdata)) != NULL)
}
memmove(transfer->filterbuf, p, transfer->filterbufdata -= (p - transfer->filterbuf));
}
+ return(0);
}
static void filterexit(pid_t pid, int status, void *data)
transfer->filter = pid;
transfersetlocalend(transfer, insock);
getsock(transfer->filterout = outsock);
- outsock->data = transfer;
- outsock->readcb = (void (*)(struct socket *, void *))filterread;
+ CBREG(outsock, socket_read, (int (*)(struct socket *, void *))filterread, NULL, transfer);
putsock(insock);
putsock(outsock);
free(filtername);