/*
* Dolda Connect - Modular multiuser Direct Connect-style client
- * Copyright (C) 2004 Fredrik Tolf (fredrik@dolda2000.com)
+ * Copyright (C) 2004 Fredrik Tolf <fredrik@dolda2000.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <grp.h>
#include <errno.h>
#include <sys/wait.h>
+#include <stdint.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#include "auth.h"
#include "transfer.h"
#include "module.h"
+#include "client.h"
static void killfilter(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->actdesc);
if(transfer->filterbuf != 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;
return(new);
}
-void transferaddarg(struct transfer *transfer, wchar_t *rec, wchar_t *val)
+static void localread(struct socket *sk, struct transfer *transfer)
{
- struct transarg *ta;
+ void *buf;
+ size_t blen;
- ta = smalloc(sizeof(*ta));
- ta->rec = swcsdup(rec);
- ta->val = swcsdup(val);
- ta->next = transfer->args;
- transfer->args = ta;
+ if((transfer->datapipe != NULL) && (sockqueueleft(transfer->datapipe) > 0)) {
+ buf = sockgetinbuf(sk, &blen);
+ if((transfer->endpos >= 0) && (transfer->curpos + blen > transfer->endpos))
+ blen = transfer->endpos - transfer->curpos;
+ sockqueue(transfer->datapipe, buf, blen);
+ free(buf);
+ time(&transfer->activity);
+ transfer->curpos += blen;
+ bytesupload += blen;
+ CBCHAINDOCB(transfer, trans_p, transfer);
+ }
}
-void transferattach(struct transfer *transfer, struct transferiface *iface, void *data)
+static void dataread(struct socket *sk, struct transfer *transfer)
{
- if(transfer->iface != NULL)
- transferdetach(transfer);
- transfer->iface = iface;
- transfer->ifacedata = data;
+ void *buf;
+ size_t blen;
+
+ if((transfer->localend != NULL) && (sockqueueleft(transfer->localend) > 0)) {
+ buf = sockgetinbuf(sk, &blen);
+ if((transfer->endpos >= 0) && (transfer->curpos + blen > transfer->endpos))
+ blen = transfer->endpos - transfer->curpos;
+ sockqueue(transfer->localend, buf, blen);
+ free(buf);
+ transfer->curpos += blen;
+ bytesdownload += blen;
+ CBCHAINDOCB(transfer, trans_p, transfer);
+ }
+}
+
+static void localwrite(struct socket *sk, struct transfer *transfer)
+{
+ if(transfer->datapipe != NULL)
+ dataread(transfer->datapipe, transfer);
+}
+
+static void datawrite(struct socket *sk, struct transfer *transfer)
+{
+ if(transfer->localend != NULL)
+ localread(transfer->localend, transfer);
+}
+
+static void localerr(struct socket *sk, int errno, struct transfer *transfer)
+{
+ if(transfer->datapipe != NULL)
+ closesock(transfer->datapipe);
+}
+
+static void dataerr(struct socket *sk, int errno, struct transfer *transfer)
+{
+ if(transfer->curpos >= transfer->size) {
+ transfersetstate(transfer, TRNS_DONE);
+ if(transfer->localend != NULL) {
+ closesock(transfer->localend);
+ quitsock(transfer->localend);
+ transfer->localend = NULL;
+ }
+ } else {
+ resettransfer(transfer);
+ }
+}
+
+void transferattach(struct transfer *transfer, struct socket *dpipe)
+{
+ transferdetach(transfer);
+ getsock(transfer->datapipe = dpipe);
+ dpipe->readcb = (void (*)(struct socket *, void *))dataread;
+ dpipe->writecb = (void (*)(struct socket *, void *))datawrite;
+ dpipe->errcb = (void (*)(struct socket *, int, void *))dataerr;
+ dpipe->data = transfer;
}
void transferdetach(struct transfer *transfer)
{
- if(transfer->iface != NULL)
+ if(transfer->datapipe != NULL) {
+ closesock(transfer->datapipe);
+ quitsock(transfer->datapipe);
+ }
+ transfer->datapipe = NULL;
+}
+
+struct transfer *finddownload(wchar_t *peerid)
+{
+ struct transfer *transfer;
+
+ for(transfer = transfers; transfer != NULL; transfer = transfer->next)
+ {
+ if((transfer->dir == TRNSD_DOWN) && (transfer->datapipe == 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)
{
- transfer->iface->detach(transfer, transfer->ifacedata);
- transfer->iface = NULL;
- transfer->ifacedata = NULL;
+ 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 *newupload(struct fnetnode *fn, struct fnet *fnet, wchar_t *nickid, struct socket *dpipe)
{
struct transfer *transfer;
transfer->dir = TRNSD_UP;
if(fn != NULL)
getfnetnode(transfer->fn = fn);
- transferattach(transfer, iface, data);
+ transferattach(transfer, dpipe);
linktransfer(transfer);
bumptransfer(transfer);
return(transfer);
{
if(transfer->dir == TRNSD_DOWN)
{
- if(transfer->iface != NULL)
- transferdetach(transfer);
+ transferdetach(transfer);
killfilter(transfer);
transfersetstate(transfer, TRNS_WAITING);
transfersetactivity(transfer, L"reset");
transfer->timeout = 0;
}
-static void transferread(struct socket *sk, struct transfer *transfer)
+void transferprepul(struct transfer *transfer, off_t size, off_t start, off_t end, struct socket *lesk)
{
- if(sockgetdatalen(sk) >= 65536)
- sk->ignread = 1;
- if((transfer->iface != NULL) && (transfer->iface->gotdata != NULL))
- transfer->iface->gotdata(transfer, transfer->ifacedata);
+ transfersetsize(transfer, size);
+ transfer->curpos = start;
+ transfer->endpos = end;
+ transfersetlocalend(transfer, lesk);
}
-static void transferwrite(struct socket *sk, struct transfer *transfer)
+void transferstartdl(struct transfer *transfer, struct socket *sk)
{
- if((transfer->iface != NULL) && (transfer->iface->wantdata != NULL))
- transfer->iface->wantdata(transfer, transfer->ifacedata);
+ transfersetstate(transfer, TRNS_MAIN);
+ socksettos(sk, confgetint("transfer", "dltos"));
}
-static void transfererr(struct socket *sk, int errno, struct transfer *transfer)
+void transferstartul(struct transfer *transfer, struct socket *sk)
{
- if((transfer->iface != NULL) && (transfer->iface->endofdata != NULL))
- transfer->iface->endofdata(transfer, transfer->ifacedata);
+ transfersetstate(transfer, TRNS_MAIN);
+ socksettos(sk, confgetint("transfer", "ultos"));
+ if(transfer->localend != NULL)
+ localread(transfer->localend, transfer);
}
-void transferputdata(struct transfer *transfer, void *buf, size_t size)
+void transfersetlocalend(struct transfer *transfer, struct socket *sk)
{
- time(&transfer->activity);
- sockqueue(transfer->localend, buf, size);
- transfer->curpos += size;
- CBCHAINDOCB(transfer, trans_p, transfer);
+ if(transfer->localend != NULL)
+ putsock(transfer->localend);
+ socksetdebug(sk, 2, "localend");
+ getsock(transfer->localend = sk);
+ sk->data = transfer;
+ sk->readcb = (void (*)(struct socket *, void *))localread;
+ sk->writecb = (void (*)(struct socket *, void *))localwrite;
+ sk->errcb = (void (*)(struct socket *, int, void *))localerr;
}
-void transferendofdata(struct transfer *transfer)
+static int tryreq(struct transfer *transfer)
{
- if(transfer->curpos >= transfer->size)
+ struct fnetnode *fn;
+ struct fnetpeer *peer;
+
+ if((fn = transfer->fn) != NULL)
{
- transfersetstate(transfer, TRNS_DONE);
- transfer->localend->readcb = NULL;
- transfer->localend->writecb = NULL;
- transfer->localend->errcb = NULL;
- putsock(transfer->localend);
- transfer->localend = NULL;
+ if(fn->state != FNN_EST)
+ {
+ transfer->close = 1;
+ return(1);
+ }
+ peer = fnetfindpeer(fn, transfer->peerid);
} else {
- resettransfer(transfer);
+ 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);
}
-size_t transferdatasize(struct transfer *transfer)
-{
- return(sockqueuesize(transfer->localend));
-}
-
-void *transfergetdata(struct transfer *transfer, size_t *size)
+void trytransferbypeer(struct fnet *fnet, wchar_t *peerid)
{
- void *buf;
+ struct transfer *transfer;
- if(transfer->localend == NULL)
- return(NULL);
- transfer->localend->ignread = 0;
- time(&transfer->activity);
- if((buf = sockgetinbuf(transfer->localend, size)) == NULL)
- return(NULL);
- if((transfer->endpos >= 0) && (transfer->curpos + *size >= transfer->endpos))
+ for(transfer = transfers; transfer != NULL; transfer = transfer->next)
{
- *size = transfer->endpos - transfer->curpos;
- buf = srealloc(buf, *size);
+ if((transfer->dir == TRNSD_DOWN) && (transfer->state == TRNS_WAITING))
+ {
+ if((transfer->fnet == fnet) && !wcscmp(transfer->peerid, peerid))
+ {
+ if(!tryreq(transfer))
+ return;
+ }
+ }
}
- transfer->curpos += *size;
- CBCHAINDOCB(transfer, trans_p, transfer);
- return(buf);
-}
-
-void transferprepul(struct transfer *transfer, size_t size, size_t start, size_t end, struct socket *lesk)
-{
- transfersetsize(transfer, size);
- transfer->curpos = start;
- transfer->endpos = end;
- lesk->ignread = 1;
- transfersetlocalend(transfer, lesk);
-}
-
-void transferstartul(struct transfer *transfer, struct socket *sk)
-{
- transfersetstate(transfer, TRNS_MAIN);
- socksettos(sk, confgetint("transfer", "ultos"));
- if(transfer->localend != NULL)
- transfer->localend->ignread = 0;
-}
-
-void transfersetlocalend(struct transfer *transfer, struct socket *sk)
-{
- 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;
}
void bumptransfer(struct transfer *transfer)
{
- struct fnetnode *fn;
- struct fnetpeer *peer;
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"nick");
}
-void transfersetsize(struct transfer *transfer, int newsize)
+void transfersetsize(struct transfer *transfer, off_t newsize)
{
transfer->size = newsize;
CBCHAINDOCB(transfer, trans_ac, transfer, L"size");
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;
transfer->filterbufsize = transfer->filterbufdata = 0;
}
-static char *findfilter(struct passwd *pwd)
+static void handletranscmd(struct transfer *transfer, wchar_t *cmd, wchar_t *arg)
{
- char *path, *filtername;
-
- if((path = sprintf2("%s/.dcdl-filter", pwd->pw_dir)) != NULL)
- {
- if(!access(path, X_OK))
- return(path);
- free(path);
- }
- if((filtername = icwcstombs(confgetstr("transfer", "filter"), NULL)) == NULL)
- {
- flog(LOG_WARNING, "could not convert filter name into local charset: %s", strerror(errno));
- } else {
- if(strchr(filtername, '/') == NULL)
- {
- if((path = sprintf2("/etc/%s", filtername)) != NULL)
- {
- if(!access(path, X_OK))
- {
- free(filtername);
- return(path);
- }
- free(path);
- }
- if((path = sprintf2("/usr/etc/%s", filtername)) != NULL)
- {
- if(!access(path, X_OK))
- {
- free(filtername);
- return(path);
- }
- free(path);
- }
- if((path = sprintf2("/usr/local/etc/%s", filtername)) != NULL)
- {
- if(!access(path, X_OK))
- {
- free(filtername);
- return(path);
- }
- free(path);
- }
- } else {
- if(!access(filtername, X_OK))
- return(filtername);
- }
- free(filtername);
+ if(!wcscmp(cmd, L"status")) {
+ if(arg == NULL)
+ arg = L"";
+ if(transfer->exitstatus != NULL)
+ free(transfer->exitstatus);
+ transfer->exitstatus = swcsdup(arg);
}
- return(NULL);
}
static void filterread(struct socket *sk, struct transfer *transfer)
return;
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);
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;
}
}
int forkfilter(struct transfer *transfer)
{
- char *filtername, *filename, *peerid, *buf;
+ char *filtername, *filename, *peerid, *buf, *p;
wchar_t *wfilename;
struct passwd *pwent;
pid_t pid;
char **argv;
size_t argvsize, argvdata;
struct socket *insock, *outsock;
- struct transarg *ta;
+ struct wcspair *ta;
char *rec, *val;
- wfilename = transfer->path;
- if(transfer->fnet->filebasename != NULL)
- wfilename = transfer->fnet->filebasename(wfilename);
+ wfilename = fnfilebasename(transfer->path);
if(transfer->auth == NULL)
{
flog(LOG_WARNING, "tried to fork filter for transfer with NULL authhandle (tranfer %i)", transfer->id);
errno = EACCES;
return(-1);
}
- if((filtername = findfilter(pwent)) == NULL)
+ filtername = findfile("dc-filter", pwent->pw_dir, 0);
+ if(filtername == NULL)
+ filtername = findfile(icswcstombs(confgetstr("transfer", "filter"), NULL, NULL), NULL, 0);
+ if(filtername == NULL)
{
flog(LOG_WARNING, "could not find filter for user %s", pwent->pw_name);
errno = ENOENT;
peerid = sprintf2("utf8-%s", buf);
free(buf);
}
+ for(p = filename; *p; p++) {
+ if(*p == '/')
+ *p = '_';
+ else if((p == filename) && (*p == '.'))
+ *p = '_';
+ }
if((pid = forksess(transfer->owner, transfer->auth, filterexit, NULL, FD_PIPE, 0, O_WRONLY, &inpipe, FD_PIPE, 1, O_RDONLY, &outpipe, FD_FILE, 2, O_RDWR, "/dev/null", FD_END)) < 0)
{
flog(LOG_WARNING, "could not fork session for filter for transfer %i: %s", transfer->id, strerror(errno));
{
argv = NULL;
argvsize = argvdata = 0;
- buf = sprintf2("%i", transfer->size);
+ buf = sprintf2("%ji", (intmax_t)transfer->size);
addtobuf(argv, filtername);
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;
* the fd, and thus it closes it. Until I can find out whyever the
* kernel gives a POLLIN on the fd (if I can at all...), I'll just
* set ignread on insock for now. */
- insock->ignread = 1;
+/* sockblock(insock, 1); */
transfer->filter = pid;
transfersetlocalend(transfer, insock);
getsock(transfer->filterout = outsock);
{
struct transfer *transfer, *next;
+ /*
for(transfer = transfers; transfer != NULL; transfer = transfer->next)
{
if((transfer->endpos >= 0) && (transfer->state == TRNS_MAIN) && (transfer->localend != NULL) && (transfer->localend->state == SOCK_EST) && (transfer->curpos >= transfer->endpos))
closesock(transfer->localend);
}
}
+ */
for(transfer = transfers; transfer != NULL; transfer = next)
{
next = transfer->next;
static struct configvar myvars[] =
{
+ /** The maximum number of simultaneously permitted uploads. A
+ * common hub rule is that you will need at least as many slots as
+ * the number of hubs to which you are connected. */
{CONF_VAR_INT, "slots", {.num = 3}},
+ /** The TOS value to use for upload connections (see the TOS
+ * VALUES section). */
{CONF_VAR_INT, "ultos", {.num = SOCK_TOS_MAXTP}},
+ /** The TOS value to use for download connections (see the TOS
+ * VALUES section). */
{CONF_VAR_INT, "dltos", {.num = SOCK_TOS_MAXTP}},
+ /** The name of the filter script (see the FILES section for
+ * lookup information). */
{CONF_VAR_STRING, "filter", {.str = L"dc-filter"}},
+ /** If true, only one upload is allowed per remote peer. This
+ * option is still experimental, so it is recommended to leave it
+ * off. */
+ {CONF_VAR_BOOL, "ulquota", {.num = 0}},
{CONF_VAR_END}
};