/*
* 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 "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)
{
- CBUNREG(transfer->localend, socket_read, transferread, transfer);
- CBUNREG(transfer->localend, socket_write, transferwrite, transfer);
- CBUNREG(transfer->localend, socket_err, transfererr, transfer);
+ transfer->localend->readcb = NULL;
+ transfer->localend->writecb = NULL;
+ transfer->localend->errcb = NULL;
putsock(transfer->localend);
}
if(transfer->filterout != NULL)
{
- CBUNREG(transfer->filterout, socket_read, filterread, transfer);
+ transfer->filterout->readcb = NULL;
+ transfer->filterout->writecb = NULL;
+ transfer->filterout->errcb = NULL;
putsock(transfer->filterout);
}
if(transfer->fn != NULL)
return(new);
}
-void transferattach(struct transfer *transfer, struct transferiface *iface, void *data)
+static void localread(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->datapipe != NULL) && (sockqueueleft(transfer->datapipe) > 0)) {
+ buf = sockgetinbuf(sk, &blen);
+ sockqueue(transfer->datapipe, buf, blen);
+ }
+}
+
+static void dataread(struct socket *sk, struct transfer *transfer)
+{
+ void *buf;
+ size_t blen;
+
+ if((transfer->localend != NULL) && (sockqueueleft(transfer->localend) > 0)) {
+ buf = sockgetinbuf(sk, &blen);
+ sockqueue(transfer->localend, buf, blen);
+ }
+}
+
+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->localend != NULL)
+ closesock(transfer->localend);
+}
+
+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)
- {
- transfer->iface->detach(transfer, transfer->ifacedata);
- transfer->iface = NULL;
- transfer->ifacedata = NULL;
+ if(transfer->datapipe != NULL) {
+ transfer->datapipe->readcb = NULL;
+ transfer->datapipe->writecb = NULL;
+ transfer->datapipe->errcb = NULL;
+ closesock(transfer->datapipe);
+ putsock(transfer->datapipe);
}
+ transfer->datapipe = NULL;
}
struct transfer *finddownload(wchar_t *peerid)
for(transfer = transfers; transfer != NULL; transfer = transfer->next)
{
- if((transfer->dir == TRNSD_DOWN) && (transfer->iface == NULL) && !wcscmp(peerid, transfer->peerid))
+ if((transfer->dir == TRNSD_DOWN) && (transfer->datapipe == NULL) && !wcscmp(peerid, transfer->peerid))
break;
}
return(transfer);
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 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 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 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)
+static void transferputdata(struct transfer *transfer, void *buf, size_t size)
{
time(&transfer->activity);
sockqueue(transfer->localend, buf, size);
CBCHAINDOCB(transfer, trans_p, transfer);
}
-void transferendofdata(struct transfer *transfer)
+static void transferendofdata(struct transfer *transfer)
{
if(transfer->curpos >= transfer->size)
{
transfersetstate(transfer, TRNS_DONE);
- CBUNREG(transfer->localend, socket_read, transferread, transfer);
- CBUNREG(transfer->localend, socket_write, transferwrite, transfer);
- CBUNREG(transfer->localend, socket_err, transfererr, transfer);
+ transfer->localend->readcb = NULL;
+ transfer->localend->writecb = NULL;
+ transfer->localend->errcb = NULL;
putsock(transfer->localend);
transfer->localend = NULL;
} else {
}
}
-size_t transferdatasize(struct transfer *transfer)
+static ssize_t transferdatasize(struct transfer *transfer)
{
- return(sockqueuesize(transfer->localend));
+ return(sockqueueleft(transfer->localend));
}
-void *transfergetdata(struct transfer *transfer, size_t *size)
+static void *transfergetdata(struct transfer *transfer, size_t *size)
{
void *buf;
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))
{
- *size = transfer->endpos - transfer->curpos;
- buf = srealloc(buf, *size);
+ if((*size = transfer->endpos - transfer->curpos) == 0) {
+ free(buf);
+ buf = NULL;
+ } else {
+ buf = srealloc(buf, *size);
+ }
}
transfer->curpos += *size;
bytesupload += *size;
return(buf);
}
-void transferprepul(struct transfer *transfer, size_t size, size_t start, size_t end, struct socket *lesk)
+void transferprepul(struct transfer *transfer, off_t size, off_t start, off_t end, struct socket *lesk)
{
transfersetsize(transfer, size);
transfer->curpos = start;
transfer->endpos = end;
- lesk->ignread = 1;
transfersetlocalend(transfer, lesk);
}
transfersetstate(transfer, TRNS_MAIN);
socksettos(sk, confgetint("transfer", "ultos"));
if(transfer->localend != NULL)
- transfer->localend->ignread = 0;
+ localread(transfer->localend, transfer);
}
void transfersetlocalend(struct transfer *transfer, struct socket *sk)
if(transfer->localend != NULL)
putsock(transfer->localend);
getsock(transfer->localend = sk);
- 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);
+ 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;
}
static int tryreq(struct transfer *transfer)
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");
}
if(transfer->localend)
{
- CBUNREG(transfer->localend, socket_read, transferread, transfer);
- CBUNREG(transfer->localend, socket_write, transferwrite, transfer);
- CBUNREG(transfer->localend, socket_err, transfererr, transfer);
+ transfer->localend->readcb = NULL;
+ transfer->localend->writecb = NULL;
+ transfer->localend->errcb = NULL;
putsock(transfer->localend);
transfer->localend = NULL;
}
if(transfer->filterout)
{
- CBUNREG(transfer->filterout, socket_read, filterread, transfer);
+ transfer->filterout->readcb = NULL;
putsock(transfer->filterout);
transfer->filterout = NULL;
}
transfer->filterbufsize = transfer->filterbufdata = 0;
}
-static char *findfilter(struct passwd *pwd)
-{
- 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);
- }
- return(NULL);
-}
-
static void handletranscmd(struct transfer *transfer, wchar_t *cmd, wchar_t *arg)
{
if(!wcscmp(cmd, L"status")) {
}
}
-static int filterread(struct socket *sk, struct transfer *transfer)
+static void 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(0);
+ return;
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)
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;
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);
* 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);
- CBREG(outsock, socket_read, (int (*)(struct socket *, void *))filterread, NULL, transfer);
+ outsock->data = transfer;
+ outsock->readcb = (void (*)(struct socket *, void *))filterread;
putsock(insock);
putsock(outsock);
free(filtername);
{
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}
};
Dolda2000 GitWeb / doldaconnect.git / blobdiff