From: fredrik <fredrik@959494ce-11ee-0310-bf91-de5d638817bd>
Date: Wed, 9 Nov 2005 03:07:22 +0000 (+0000)
Subject: Add trytransferbypeer.
X-Git-Tag: 0.1~93
X-Git-Url: http://dolda2000.com/gitweb/?p=doldaconnect.git;a=commitdiff_plain;h=18f56d133715db3184ce7f11c34d4113268a722f

Add trytransferbypeer.


git-svn-id: svn+ssh://svn.dolda2000.com/srv/svn/repos/src/doldaconnect@486 959494ce-11ee-0310-bf91-de5d638817bd
---

diff --git a/daemon/transfer.c b/daemon/transfer.c
index b2be0fe..f4f0fef 100644
--- a/daemon/transfer.c
+++ b/daemon/transfer.c
@@ -317,14 +317,56 @@ 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)
+	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 +376,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)