X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ffnet-dc.c;h=75c5c8b03e0df0f86b5814efba655348005e3eb2;hb=14a9e5fd98873ace8b10bb86c4b079374329ca62;hp=df04b59f9755289cedacbd56fbbd73b50b2b521c;hpb=df873cd0a5330851f2a8bedb1871d29ab5fbd535;p=doldaconnect.git

diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index df04b59..75c5c8b 100644
--- a/daemon/fnet-dc.c
+++ b/daemon/fnet-dc.c
@@ -128,6 +128,7 @@ struct dcpeer
     size_t inbufdata, inbufsize;
     size_t curread, totalsize;
     int freeing;
+    struct timer *timeout;
     struct qcommand *queue;
     struct transfer *transfer;
     int state;
@@ -444,6 +445,14 @@ static void hubrecvchat(struct socket *sk, struct fnetnode *fn, char *from, char
     free(chat);
 }
 
+static void peertimeout(int cancelled, struct dcpeer *peer)
+{
+    peer->timeout = NULL;
+    if(cancelled)
+	return;
+    freedcpeer(peer);
+}
+
 static void sendadc(struct socket *sk, char *arg)
 {
     char *buf;
@@ -1600,6 +1609,8 @@ static void cmd_key(struct socket *sk, struct dcpeer *peer, char *cmd, char *arg
 
 static void startdl(struct dcpeer *peer)
 {
+    if(peer->timeout != NULL)
+	canceltimer(peer->timeout);
     peer->state = PEER_TRNS;
     transferstartdl(peer->transfer, peer->sk);
     peer->sk->readcb = (void (*)(struct socket *, void *))transread;
@@ -1608,6 +1619,8 @@ static void startdl(struct dcpeer *peer)
 
 static void startul(struct dcpeer *peer)
 {
+    if(peer->timeout != NULL)
+	canceltimer(peer->timeout);
     peer->state = PEER_TRNS;
     transferstartul(peer->transfer, peer->sk);
     peer->sk->writecb = (void (*)(struct socket *, void *))transwrite;
@@ -1778,15 +1791,10 @@ static void cmd_get(struct socket *sk, struct dcpeer *peer, char *cmd, char *arg
     } else if(fd >= 0) {
 	if((buf2 = icsmbstowcs(args, DCCHARSET, NULL)) != NULL)
 	    transfersetpath(peer->transfer, buf2);
+	peer->transfer->flags.b.minislot = 1;
     }
     if(fd < 0)
     {
-	if(slotsleft() < 1)
-	{
-	    qstr(sk, "$MaxedOut|");
-	    freedcpeer(peer);
-	    return;
-	}
 	if((node = resdcpath(args, DCCHARSET, '\\')) == NULL)
 	{
 	    qstrf(sk, "$Error File not in share|");
@@ -1814,6 +1822,14 @@ static void cmd_get(struct socket *sk, struct dcpeer *peer, char *cmd, char *arg
 	freedcpeer(peer);
 	return;
     }
+    if(sb.st_size < 65536)
+	peer->transfer->flags.b.minislot = 1;
+    if(!peer->transfer->flags.b.minislot && (slotsleft() < 1)) {
+	close(fd);
+	qstr(sk, "$MaxedOut|");
+	freedcpeer(peer);
+	return;
+    }
     if((offset != 0) && (lseek(fd, offset, SEEK_SET) < 0))
     {
 	close(fd);
@@ -1917,14 +1933,10 @@ static void cmd_getblock(struct socket *sk, struct dcpeer *peer, char *cmd, char
     } else if(fd >= 0) {
 	if((buf2 = icsmbstowcs(args, charset, NULL)) != NULL)
 	    transfersetpath(peer->transfer, buf2);
+	peer->transfer->flags.b.minislot = 1;
     }
     if(fd < 0)
     {
-	if(slotsleft() < 1)
-	{
-	    qstr(sk, "$MaxedOut|");
-	    return;
-	}
 	if((node = resdcpath(p, charset, '\\')) == NULL)
 	{
 	    qstr(sk, "$Error File not in cache|");
@@ -1949,6 +1961,13 @@ static void cmd_getblock(struct socket *sk, struct dcpeer *peer, char *cmd, char
 	qstr(sk, "$Error|");
 	return;
     }
+    if(sb.st_size < 65536)
+	peer->transfer->flags.b.minislot = 1;
+    if(!peer->transfer->flags.b.minislot && (slotsleft() < 1)) {
+	close(fd);
+	qstr(sk, "$MaxedOut|");
+	return;
+    }
     if((start != 0) && ((start >= sb.st_size) || (lseek(fd, start, SEEK_SET) < 0)))
     {
 	close(fd);
@@ -2001,14 +2020,10 @@ static void cmd_adcget(struct socket *sk, struct dcpeer *peer, char *cmd, char *
     } else if(fd >= 0) {
 	if((wbuf = icsmbstowcs(argv[1], "UTF-8", NULL)) != NULL)
 	    transfersetpath(peer->transfer, wbuf);
+	peer->transfer->flags.b.minislot = 1;
     }
     if(fd < 0)
     {
-	if(slotsleft() < 1)
-	{
-	    qstr(sk, "$MaxedOut|");
-	    goto out;
-	}
 	if(!strncmp(argv[1], "TTH/", 4))
 	{
 	    if((node = findbytth(argv[1] + 4)) == NULL)
@@ -2048,6 +2063,12 @@ static void cmd_adcget(struct socket *sk, struct dcpeer *peer, char *cmd, char *
 	    qstr(sk, "$Error|");
 	    goto out;
 	}
+	if(sb.st_size < 65536)
+	    peer->transfer->flags.b.minislot = 1;
+	if(!peer->transfer->flags.b.minislot && (slotsleft() < 1)) {
+	    qstr(sk, "$MaxedOut|");
+	    goto out;
+	}
 	if((start != 0) && ((start >= sb.st_size) || (lseek(fd, start, SEEK_SET) < 0)))
 	{
 	    qstr(sk, "$Error Offset out of range|");
@@ -2111,6 +2132,8 @@ static void handletthl(struct dcpeer *peer)
     }
     if(peer->curread >= peer->totalsize)
     {
+	if(peer->timeout == NULL)
+	    peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
 	peer->state = PEER_CMD;
 	synctigertree(&peer->tth);
 	restigertree(&peer->tth, buf);
@@ -2149,6 +2172,8 @@ static void cmd_adcsnd(struct socket *sk, struct dcpeer *peer, char *cmd, char *
 	    freedcpeer(peer);
 	    goto out;
 	}
+	if(peer->timeout != NULL)
+	    canceltimer(peer->timeout);
 	peer->state = PEER_TTHL;
 	peer->totalsize = numbytes;
 	peer->curread = 0;
@@ -2620,6 +2645,8 @@ static void dctransgotdata(struct transfer *transfer, struct dcpeer *peer)
 		{
 		    freedcpeer(peer);
 		} else {
+		    if(peer->timeout == NULL)
+			peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
 		    peer->state = PEER_CMD;
 		    endcompress(peer);
 		    transfersetstate(transfer, TRNS_HS);
@@ -2923,6 +2950,8 @@ static void freedcpeer(struct dcpeer *peer)
 	    resettransfer(peer->transfer);
 	transferdetach(peer->transfer);
     }
+    if(peer->timeout != NULL)
+	canceltimer(peer->timeout);
     if(peer->sk->data == peer)
 	peer->sk->data = NULL;
     peer->sk->readcb = NULL;
@@ -3076,6 +3105,7 @@ static void peerconnect(struct socket *sk, int err, struct fnetnode *fn)
     sk->data = peer;
     socksettos(sk, confgetint("fnet", "fnptos"));
     putsock(sk);
+    peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
     sendmynick(peer);
     sendpeerlock(peer);
 }
@@ -3090,6 +3120,7 @@ static void peeraccept(struct socket *sk, struct socket *newsk, void *data)
     newsk->errcb = (void (*)(struct socket *, int, void *))peererror;
     newsk->data = peer;
     socksettos(newsk, confgetint("fnet", "fnptos"));
+    peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
 }
 
 static void updatehmlist(void)
@@ -3449,6 +3480,9 @@ static int run(void)
 	nextpeer = peer->next;
 	if((qcmd = ulqcmd(&peer->queue)) != NULL)
 	{
+	    if(peer->timeout != NULL)
+		canceltimer(peer->timeout);
+	    peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
 	    if(*qcmd->string == '$')
 		dispatchcommand(qcmd, peercmds, peer->sk, peer);
 	    freeqcmd(qcmd);