X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ftransfer.c;h=c432815174b7460a680e34f6d1bfe8e1bdb90452;hb=dcf7a1a214150f84d51159c9c679b7697cb05298;hp=48a3b3a2c051f2aea91439a3efa8ce8acb177d0a;hpb=c458597e9136094237260be626621098cbe54e50;p=doldaconnect.git

diff --git a/daemon/transfer.c b/daemon/transfer.c
index 48a3b3a..c432815 100644
--- a/daemon/transfer.c
+++ b/daemon/transfer.c
@@ -1,6 +1,6 @@
 /*
  *  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
@@ -292,8 +292,12 @@ void *transfergetdata(struct transfer *transfer, size_t *size)
 	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;
@@ -301,7 +305,7 @@ void *transfergetdata(struct transfer *transfer, size_t *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;
@@ -457,7 +461,7 @@ void transfersetnick(struct transfer *transfer, wchar_t *newnick)
     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");
@@ -528,58 +532,6 @@ static void killfilter(struct transfer *transfer)
     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")) {
@@ -679,7 +631,10 @@ int forkfilter(struct transfer *transfer)
 	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;
@@ -715,7 +670,7 @@ int forkfilter(struct transfer *transfer)
     {
 	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);
@@ -798,10 +753,23 @@ static int run(void)
 
 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}
 };