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

diff --git a/daemon/transfer.c b/daemon/transfer.c
index 066febc..f5b6b50 100644
--- a/daemon/transfer.c
+++ b/daemon/transfer.c
@@ -155,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;
@@ -617,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)
     {
@@ -624,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;
 	}
     }