X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ftransfer.c;h=066febca6905662b51b2f941453e6cabec8cb77d;hb=a8e6bb8183d91e91e4244d55cc24829db4ce307d;hp=b2be0fed0a6caa66769ea8d1cf285c77487a1deb;hpb=9ec790e8b81566b934c056c56ece342ba0a32873;p=doldaconnect.git

diff --git a/daemon/transfer.c b/daemon/transfer.c
index b2be0fe..066febc 100644
--- a/daemon/transfer.c
+++ b/daemon/transfer.c
@@ -40,6 +40,8 @@
 
 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 *);
@@ -78,6 +80,8 @@ void freetransfer(struct transfer *transfer)
 	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;
@@ -240,6 +244,7 @@ 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);
 }
 
@@ -279,6 +284,7 @@ void *transfergetdata(struct transfer *transfer, size_t *size)
 	buf = srealloc(buf, *size);
     }
     transfer->curpos += *size;
+    bytesupload += *size;
     CBCHAINDOCB(transfer, trans_p, transfer);
     return(buf);
 }
@@ -317,14 +323,59 @@ void transfersetlocalend(struct transfer *transfer, struct socket *sk)
     sk->errcb = (void (*)(struct socket *, int, void *))transfererr;
 }
 
-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;
@@ -334,32 +385,9 @@ void bumptransfer(struct transfer *transfer)
     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)
@@ -540,6 +568,17 @@ static char *findfilter(struct passwd *pwd)
     return(NULL);
 }
 
+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 void filterread(struct socket *sk, struct transfer *transfer)
 {
     char *buf, *p, *p2;
@@ -550,7 +589,7 @@ 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)
@@ -561,8 +600,9 @@ static void filterread(struct socket *sk, struct transfer *transfer)
 	    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);
@@ -590,6 +630,7 @@ static void filterexit(pid_t pid, int status, void *data)
 	    } else {
 		freetransfer(transfer);
 	    }
+	    trytransferbypeer(transfer->fnet, transfer->peerid);
 	    break;
 	}
     }