#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;
struct transfer *transfers = NULL;
int numtransfers = 0;
GCBCHAIN(newtransfercb, struct transfer *);
void freetransfer(struct transfer *transfer)
{
- struct transarg *ta;
-
if(transfer == transfers)
transfers = transfer->next;
if(transfer->next != NULL)
CBCHAINFREE(transfer, trans_p);
CBCHAINFREE(transfer, trans_destroy);
CBCHAINFREE(transfer, trans_filterout);
- while((ta = transfer->args) != NULL)
- {
- transfer->args = ta->next;
- free(ta->rec);
- free(ta->val);
- free(ta);
- }
+ while(transfer->args != NULL)
+ freewcspair(transfer->args, &transfer->args);
if(transfer->filter != -1)
killfilter(transfer);
if(transfer->etimer != NULL)
free(transfer->filterbuf);
if(transfer->hash != NULL)
freehash(transfer->hash);
+ if(transfer->exitstatus != NULL)
+ 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)
return(new);
}
-void transferaddarg(struct transfer *transfer, wchar_t *rec, wchar_t *val)
-{
- struct transarg *ta;
-
- ta = smalloc(sizeof(*ta));
- ta->rec = swcsdup(rec);
- ta->val = swcsdup(val);
- ta->next = transfer->args;
- transfer->args = ta;
-}
-
void transferattach(struct transfer *transfer, struct transferiface *iface, void *data)
{
if(transfer->iface != NULL)
}
}
+struct transfer *finddownload(wchar_t *peerid)
+{
+ struct transfer *transfer;
+
+ for(transfer = transfers; transfer != NULL; transfer = transfer->next)
+ {
+ if((transfer->dir == TRNSD_DOWN) && (transfer->iface == NULL) && !wcscmp(peerid, transfer->peerid))
+ break;
+ }
+ return(transfer);
+}
+
+struct transfer *hasupload(struct fnet *fnet, wchar_t *peerid)
+{
+ struct transfer *transfer;
+
+ for(transfer = transfers; transfer != NULL; transfer = transfer->next)
+ {
+ if((transfer->dir == TRNSD_UP) && (transfer->fnet == fnet) && !wcscmp(transfer->peerid, peerid))
+ break;
+ }
+ return(transfer);
+}
+
struct transfer *newupload(struct fnetnode *fn, struct fnet *fnet, wchar_t *nickid, struct transferiface *iface, void *data)
{
struct transfer *transfer;
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)
time(&transfer->activity);
sockqueue(transfer->localend, buf, size);
transfer->curpos += size;
+ bytesdownload += size;
CBCHAINDOCB(transfer, trans_p, transfer);
}
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 {
buf = srealloc(buf, *size);
}
transfer->curpos += *size;
+ bytesupload += *size;
CBCHAINDOCB(transfer, trans_p, transfer);
return(buf);
}
transfersetlocalend(transfer, lesk);
}
+void transferstartdl(struct transfer *transfer, struct socket *sk)
+{
+ transfersetstate(transfer, TRNS_MAIN);
+ socksettos(sk, confgetint("transfer", "dltos"));
+}
+
void transferstartul(struct transfer *transfer, struct socket *sk)
{
transfersetstate(transfer, TRNS_MAIN);
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);
}
-void bumptransfer(struct transfer *transfer)
+static int tryreq(struct transfer *transfer)
{
struct fnetnode *fn;
struct fnetpeer *peer;
+
+ if((fn = transfer->fn) != NULL)
+ {
+ if(fn->state != FNN_EST)
+ {
+ transfer->close = 1;
+ return(1);
+ }
+ peer = fnetfindpeer(fn, transfer->peerid);
+ } else {
+ peer = NULL;
+ for(fn = fnetnodes; fn != NULL; fn = fn->next)
+ {
+ if((fn->state == FNN_EST) && (fn->fnet == transfer->fnet) && ((peer = fnetfindpeer(fn, transfer->peerid)) != NULL))
+ break;
+ }
+ }
+ if(peer != NULL)
+ {
+ time(&transfer->lastreq);
+ return(fn->fnet->reqconn(peer));
+ }
+ return(1);
+}
+
+void trytransferbypeer(struct fnet *fnet, wchar_t *peerid)
+{
+ struct transfer *transfer;
+
+ for(transfer = transfers; transfer != NULL; transfer = transfer->next)
+ {
+ if((transfer->dir == TRNSD_DOWN) && (transfer->state == TRNS_WAITING))
+ {
+ if((transfer->fnet == fnet) && !wcscmp(transfer->peerid, peerid))
+ {
+ if(!tryreq(transfer))
+ return;
+ }
+ }
+ }
+}
+
+void bumptransfer(struct transfer *transfer)
+{
time_t now;
if((now = time(NULL)) < transfer->timeout)
{
+
if(transfer->etimer == NULL)
transfer->etimer = timercallback(transfer->timeout, (void (*)(int, void *))transexpire, transfer);
return;
switch(transfer->state)
{
case TRNS_WAITING:
- if(transfer->fn != NULL)
- {
- fn = transfer->fn;
- if(fn->state != FNN_EST)
- {
- transfer->close = 1;
- return;
- }
- peer = fnetfindpeer(fn, transfer->peerid);
- } else {
- peer = NULL;
- for(fn = fnetnodes; fn != NULL; fn = fn->next)
- {
- if((fn->state == FNN_EST) && (fn->fnet == transfer->fnet) && ((peer = fnetfindpeer(fn, transfer->peerid)) != NULL))
- break;
- }
- }
transfer->etimer = timercallback(transfer->timeout = (time(NULL) + 30), (void (*)(int, void *))transexpire, transfer);
if(now - transfer->lastreq > 30)
- {
- if(peer != NULL)
- {
- fn->fnet->reqconn(peer);
- time(&transfer->lastreq);
- }
- }
+ tryreq(transfer);
break;
case TRNS_HS:
if(transfer->dir == TRNSD_UP)
CBCHAINDOCB(transfer, trans_ac, transfer, L"path");
}
+void transfersethash(struct transfer *transfer, struct hash *hash)
+{
+ if(transfer->hash != NULL)
+ freehash(transfer->hash);
+ transfer->hash = hash;
+ CBCHAINDOCB(transfer, trans_ac, transfer, L"hash");
+}
+
int slotsleft(void)
{
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;
}
return(NULL);
}
-static void filterread(struct socket *sk, struct transfer *transfer)
+static void handletranscmd(struct transfer *transfer, wchar_t *cmd, wchar_t *arg)
+{
+ if(!wcscmp(cmd, L"status")) {
+ if(arg == NULL)
+ arg = L"";
+ if(transfer->exitstatus != NULL)
+ free(transfer->exitstatus);
+ transfer->exitstatus = swcsdup(arg);
+ }
+}
+
+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);
- if((p = memchr(transfer->filterbuf, '\n', transfer->filterbufdata)) != NULL)
+ while((p = memchr(transfer->filterbuf, '\n', transfer->filterbufdata)) != NULL)
{
*(p++) = 0;
if((p2 = strchr(transfer->filterbuf, ' ')) != NULL)
if(p2 != NULL)
{
if((arg = icmbstowcs(p2, NULL)) == NULL)
- flog(LOG_WARNING, "filter sent a string which could not be converted into the local charset: %s: %s", transfer->filterbuf, strerror(errno));
+ flog(LOG_WARNING, "filter sent a string which could not be converted into the local charset: %s: %s", p2, strerror(errno));
}
+ handletranscmd(transfer, cmd, arg);
CBCHAINDOCB(transfer, trans_filterout, transfer, cmd, arg);
if(arg != NULL)
free(arg);
}
memmove(transfer->filterbuf, p, transfer->filterbufdata -= (p - transfer->filterbuf));
}
+ return(0);
}
static void filterexit(pid_t pid, int status, void *data)
{
struct transfer *transfer;
+ struct fnet *fnet;
+ wchar_t *peerid;
for(transfer = transfers; transfer != NULL; transfer = transfer->next)
{
{
transfer->filter = -1;
killfilter(transfer);
+ fnet = transfer->fnet;
+ peerid = swcsdup(transfer->peerid);
if(WEXITSTATUS(status))
- {
resettransfer(transfer);
- } else {
+ else
freetransfer(transfer);
- }
+ trytransferbypeer(fnet, peerid);
+ free(peerid);
break;
}
}
char **argv;
size_t argvsize, argvdata;
struct socket *insock, *outsock;
- struct transarg *ta;
+ struct wcspair *ta;
char *rec, *val;
wfilename = transfer->path;
addtobuf(argv, filename);
addtobuf(argv, buf);
addtobuf(argv, peerid);
+ if(transfer->hash)
+ {
+ if((buf = icwcstombs(unparsehash(transfer->hash), NULL)) != NULL)
+ {
+ /* XXX: I am very doubtful of this, but it can just as
+ * well be argued that all data should be presented as
+ * key-value pairs. */
+ addtobuf(argv, "hash");
+ addtobuf(argv, buf);
+ } else {
+ flog(LOG_WARNING, "could not convert hash to local charset");
+ }
+ }
for(ta = transfer->args; ta != NULL; ta = ta->next)
{
- if((rec = icwcstombs(ta->rec, NULL)) == NULL)
+ if((rec = icwcstombs(ta->key, NULL)) == NULL)
continue;
if((val = icwcstombs(ta->val, NULL)) == NULL)
continue;
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);
{CONF_VAR_INT, "ultos", {.num = SOCK_TOS_MAXTP}},
{CONF_VAR_INT, "dltos", {.num = SOCK_TOS_MAXTP}},
{CONF_VAR_STRING, "filter", {.str = L"dc-filter"}},
+ {CONF_VAR_BOOL, "ulquota", {.num = 0}},
{CONF_VAR_END}
};
Dolda2000 GitWeb / doldaconnect.git / blobdiff