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

diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index 807588f..fd7a79d 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);
@@ -2423,9 +2429,9 @@ static int hubsendchat(struct fnetnode *fn, int public, wchar_t *to, wchar_t *st
     return(0);
 }
 
-static void findsizelimit(struct sexpr *sexpr, int *min, int *max)
+static void findsizelimit(struct sexpr *sexpr, off_t *min, off_t *max)
 {
-    int minl, maxl, minr, maxr, retmin, retmax;
+    off_t minl, maxl, minr, maxr, retmin, retmax;
     
     switch(sexpr->op)
     {
@@ -2469,14 +2475,14 @@ static void findsizelimit(struct sexpr *sexpr, int *min, int *max)
 	}
     case SOP_SIZELT:
 	retmin = 0;
-	retmax = sexpr->d.n - 1;
+	retmax = sexpr->d.sz - 1;
 	break;
     case SOP_SIZEEQ:
-	retmin = sexpr->d.n;
-	retmax = sexpr->d.n;
+	retmin = sexpr->d.sz;
+	retmax = sexpr->d.sz;
 	break;
     case SOP_SIZEGT:
-	retmin = sexpr->d.n + 1;
+	retmin = sexpr->d.sz + 1;
 	retmax = -1;
 	break;
     default:
@@ -2527,7 +2533,7 @@ static int hubsearch(struct fnetnode *fn, struct search *srch, struct srchfnnlis
     size_t sstrsize, sstrdata;
     struct sockaddr *name;
     socklen_t namelen;
-    int minsize, maxsize;
+    off_t minsize, maxsize;
     struct hash *hash;
     
     hub = fn->data;
@@ -2560,10 +2566,10 @@ static int hubsearch(struct fnetnode *fn, struct search *srch, struct srchfnnlis
 	if(minsize != 0)
 	{
 	    sizebuf2(sstr, sstrdata + 32, 1);
-	    sstrdata += snprintf(sstr + sstrdata, sstrsize - sstrdata, "T?F?%i?1?", minsize);
+	    sstrdata += snprintf(sstr + sstrdata, sstrsize - sstrdata, "T?F?%ji?1?", (intmax_t)minsize);
 	} else if(maxsize != -1) {
 	    sizebuf2(sstr, sstrdata + 32, 1);
-	    sstrdata += snprintf(sstr + sstrdata, sstrsize - sstrdata, "T?T?%i?1?", maxsize);
+	    sstrdata += snprintf(sstr + sstrdata, sstrsize - sstrdata, "T?T?%ji?1?", (intmax_t)maxsize);
 	} else {
 	    bufcat(sstr, "F?F?0?1?", 8);
 	}
@@ -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;
@@ -3202,7 +3218,7 @@ static void hubdestroy(struct fnetnode *fn)
     struct qcommand *qcmd;
     
     hub = (struct dchub *)fn->data;
-    putsock(hub->sk);
+    quitsock(hub->sk);
     while((qcmd = ulqcmd(&hub->queue)) != NULL)
 	freeqcmd(qcmd);
     if(hub->supports != NULL)