X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ftransfer.c;h=f5b6b50d4f268252c9d8bd6c3c5426eb18c4a629;hb=6e37d33d4f42ad119cafa516746b10adaa148e49;hp=e97da03d5f85f76d84680b8066bf20d020e1d1a3;hpb=a751b0d3c374e9d0c2f4c0ab2509c03c4f649529;p=doldaconnect.git

diff --git a/daemon/transfer.c b/daemon/transfer.c
index e97da03..f5b6b50 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;
@@ -151,6 +155,18 @@ struct transfer *finddownload(wchar_t *peerid)
     return(transfer);
 }
 
+struct transfer *hasupload(struct fnet *fnet, wchar_t *peerid)
+{
+    struct transfer *transfer;
+    
+    for(transfer = transfers; transfer != NULL; transfer = transfer->next)
+    {
+	if((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;
@@ -240,6 +256,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 +296,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);
 }
@@ -339,7 +357,10 @@ static int tryreq(struct transfer *transfer)
 	}
     }
     if(peer != NULL)
+    {
+	time(&transfer->lastreq);
 	return(fn->fnet->reqconn(peer));
+    }
     return(1);
 }
 
@@ -559,6 +580,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;
@@ -569,7 +601,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)
@@ -580,8 +612,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);
@@ -596,6 +629,8 @@ static void filterread(struct socket *sk, struct transfer *transfer)
 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)
     {
@@ -603,13 +638,14 @@ static void filterexit(pid_t pid, int status, void *data)
 	{
 	    transfer->filter = -1;
 	    killfilter(transfer);
+	    fnet = transfer->fnet;
+	    peerid = swcsdup(transfer->peerid);
 	    if(WEXITSTATUS(status))
-	    {
 		resettransfer(transfer);
-	    } else {
+	    else
 		freetransfer(transfer);
-	    }
-	    trytransferbypeer(transfer->fnet, transfer->peerid);
+	    trytransferbypeer(fnet, peerid);
+	    free(peerid);
 	    break;
 	}
     }