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

diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index 6e6a24d..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)
 {
@@ -738,7 +739,6 @@ static void requestfile(struct dcpeer *peer)
 	    peer->close = 1;
 	    return;
 	}
-	CBREG(peer->transfer, trans_filterout, (int (*)(struct transfer *, wchar_t *, wchar_t *, void *))trresumecb, NULL, peer);
 	return;
     }
     if(supports(peer, "adcget"))
@@ -872,7 +872,7 @@ static void cmd_hubname(struct socket *sk, struct fnetnode *fn, char *cmd, char
     struct dchub *hub;
     
     hub = fn->data;
-    if(hub->nativename == NULL)
+    if(hub->nativename != NULL)
 	free(hub->nativename);
     hub->nativename = sstrdup(args);
     buf = icmbstowcs(args, hub->charset);
@@ -1586,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;
@@ -1633,7 +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;
+	peerattach(peer, transfer);
 	if(peer->extended)
 	    sendsupports(peer);
 	qstrf(sk, "$Direction %s %i|", (peer->direction == TRNSD_UP)?"Upload":"Download", rand() % 10000);
@@ -1681,7 +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;
+	peerattach(peer, transfer);
 	qstrf(sk, "$Direction %s %i|", (peer->direction == TRNSD_UP)?"Upload":"Download", rand() % 10000);
 	qstrf(sk, "$Key %s|", key);
 	free(key);
@@ -2118,6 +2125,7 @@ static void cmd_adcget(struct socket *sk, struct dcpeer *peer, char *cmd, char *
     } else if(fd >= 0) {
 	if((wbuf = adc2path(argv[1])) != NULL)
 	    transfersetpath(peer->transfer, wbuf);
+	free(wbuf);
 	peer->transfer->flags.b.minislot = 1;
     }
     if(fd < 0)
@@ -2734,7 +2742,7 @@ static void dctransgotdata(struct transfer *transfer, struct dcpeer *peer)
 		}
 		if(peer->ptclose)
 		{
-		    freedcpeer(peer);
+		    peer->close = 1;
 		} else {
 		    if(peer->timeout == NULL)
 			peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
@@ -2750,11 +2758,33 @@ 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;
+    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)
@@ -2770,10 +2800,7 @@ static void transread(struct socket *sk, struct dcpeer *peer)
     }
     if(peer->transfer->curpos >= peer->transfer->size)
     {
-	closesock(peer->trpipe);
-	quitsock(peer->trpipe);
-	peer->trpipe = NULL;
-	peer->transfer = NULL;
+	peerdetach(peer);
 	peer->close = 1;
 	return;
     }
@@ -2788,10 +2815,7 @@ static void transerr(struct socket *sk, int err, struct dcpeer *peer)
 	freedcpeer(peer);
 	return;
     }
-    closesock(peer->trpipe);
-    quitsock(peer->trpipe);
-    peer->trpipe = NULL;
-    peer->transfer = NULL;
+    peerdetach(peer);
     peer->close = 1;
 }
 
@@ -2805,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)
@@ -2821,7 +2846,9 @@ static void trpipeerr(struct socket *sk, int errno, struct dcpeer *peer)
 {
     peer->state = PEER_SYNC;
     dctransgotdata(peer->transfer, peer);
-    CBUNREG(peer->transfer, trans_filterout, peer);
+    peerdetach(peer);
+    if(peer->state != PEER_CMD)
+	peer->close = 1;
 }
 
 static struct socket *mktrpipe(struct dcpeer *peer)
@@ -2829,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;
@@ -3112,7 +3140,6 @@ static struct dcpeer *newdcpeer(struct socket *sk)
     
     new = smalloc(sizeof(*new));
     memset(new, 0, sizeof(*new));
-    new->transfer = NULL;
     getsock(sk);
     new->sk = sk;
     if(confgetint("dc", "dcppemu"))
@@ -3137,18 +3164,8 @@ static void freedcpeer(struct dcpeer *peer)
 	peer->next->prev = peer->prev;
     if(peer->prev != NULL)
 	peer->prev->next = peer->next;
-    if(peer->trpipe != NULL) {
-	closesock(peer->trpipe);
-	quitsock(peer->trpipe);
-    }
     if(peer->transfer != NULL)
-    {
-	CBUNREG(peer->transfer, trans_filterout, peer);
-	if(peer->transfer->dir == TRNSD_UP)
-	    peer->transfer->close = 1;
-	if(peer->transfer->dir == TRNSD_DOWN)
-	    resettransfer(peer->transfer);
-    }
+	peerdetach(peer);
     if(peer->timeout != NULL)
 	canceltimer(peer->timeout);
     if(peer->sk->data == peer)