X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ffnet-dc.c;h=36ddb1451567807147972e1b323a920d8ef6bb26;hb=284e199aabf3b1149ec24f1aa16e9bed06ec7e91;hp=807588f6085596d1aa586bd932e0d5151c28117b;hpb=aa99ddc997b1b551804393c5233b51c40288b5f1;p=doldaconnect.git

diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index 807588f..36ddb14 100644
--- a/daemon/fnet-dc.c
+++ b/daemon/fnet-dc.c
@@ -161,6 +161,7 @@ static void updatexmllist(void);
 static void updatexmlbz2list(void);
 static void requestfile(struct dcpeer *peer);
 static void updatelists(int now);
+static int trdestroycb(struct transfer *transfer, struct dcpeer *peer);
 
 static int reservedchar(unsigned char c)
 {
@@ -1585,6 +1586,13 @@ static void cmd_mynick(struct socket *sk, struct dcpeer *peer, char *cmd, char *
     }
 }
 
+static void peerattach(struct dcpeer *peer, struct transfer *transfer)
+{
+    peer->transfer = transfer;
+    CBREG(peer->transfer, trans_filterout, (int (*)(struct transfer *, wchar_t *, wchar_t *, void *))trresumecb, NULL, peer);
+    CBREG(peer->transfer, trans_destroy, (int (*)(struct transfer *, void *))trdestroycb, NULL, peer);
+}
+
 static void cmd_direction(struct socket *sk, struct dcpeer *peer, char *cmd, char *args)
 {
     char *p;
@@ -1632,8 +1640,7 @@ static void cmd_direction(struct socket *sk, struct dcpeer *peer, char *cmd, cha
 	    transfersetstate(transfer, TRNS_HS);
 	}
 	transfersetnick(transfer, peer->wcsname);
-	peer->transfer = transfer;
-	CBREG(peer->transfer, trans_filterout, (int (*)(struct transfer *, wchar_t *, wchar_t *, void *))trresumecb, NULL, peer);
+	peerattach(peer, transfer);
 	if(peer->extended)
 	    sendsupports(peer);
 	qstrf(sk, "$Direction %s %i|", (peer->direction == TRNSD_UP)?"Upload":"Download", rand() % 10000);
@@ -1681,8 +1688,7 @@ static void cmd_peerlock(struct socket *sk, struct dcpeer *peer, char *cmd, char
 	    transfersetstate(transfer, TRNS_HS);
 	}
 	transfersetnick(transfer, peer->wcsname);
-	peer->transfer = transfer;
-	CBREG(peer->transfer, trans_filterout, (int (*)(struct transfer *, wchar_t *, wchar_t *, void *))trresumecb, NULL, peer);
+	peerattach(peer, transfer);
 	qstrf(sk, "$Direction %s %i|", (peer->direction == TRNSD_UP)?"Upload":"Download", rand() % 10000);
 	qstrf(sk, "$Key %s|", key);
 	free(key);
@@ -2755,21 +2761,30 @@ static void dctransgotdata(struct transfer *transfer, struct dcpeer *peer)
 static void peerdetach(struct dcpeer *peer)
 {
     CBUNREG(peer->transfer, trans_filterout, peer);
+    CBUNREG(peer->transfer, trans_destroy, peer);
+    peer->trpipe->pnext = NULL;
     closesock(peer->trpipe);
     quitsock(peer->trpipe);
     peer->trpipe = NULL;
-    if(peer->transfer->dir == TRNSD_UP)
-	peer->transfer->close = 1;
-    else if(peer->transfer->dir == TRNSD_DOWN)
-	resettransfer(peer->transfer);
     peer->transfer = NULL;
 }
 
+static int trdestroycb(struct transfer *transfer, struct dcpeer *peer)
+{
+    peerdetach(peer);
+    peer->close = 1;
+    return(0);
+}
+
 static void transread(struct socket *sk, struct dcpeer *peer)
 {
     void *buf;
     size_t bufsize;
     
+    if(peer->transfer == NULL) {
+	freedcpeer(peer);
+	return;
+    }
     if(sockqueueleft(peer->trpipe) < 0)
 	return;
     if((buf = sockgetinbuf(sk, &bufsize)) != NULL)
@@ -2814,6 +2829,7 @@ static void transwrite(struct socket *sk, struct dcpeer *peer)
 	return;
     }
     dctransgotdata(peer->transfer, peer);
+    sockread(peer->trpipe);
 }
 
 static void trpiperead(struct socket *sk, struct dcpeer *peer)
@@ -2831,9 +2847,8 @@ static void trpipeerr(struct socket *sk, int errno, struct dcpeer *peer)
     peer->state = PEER_SYNC;
     dctransgotdata(peer->transfer, peer);
     peerdetach(peer);
-    if(peer->state != PEER_CMD) {
+    if(peer->state != PEER_CMD)
 	peer->close = 1;
-    }
 }
 
 static struct socket *mktrpipe(struct dcpeer *peer)
@@ -2841,6 +2856,7 @@ static struct socket *mktrpipe(struct dcpeer *peer)
     struct socket *sk;
     
     sk = netsockpipe();
+    sk->pnext = peer->sk;
     sk->data = peer;
     sk->readcb = (void (*)(struct socket *, void *))trpiperead;
     sk->writecb = (void (*)(struct socket *, void *))trpipewrite;