X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ffnet-dc.c;h=a7188b1da2e5743fd250a6cdf1a3355fb7a02d17;hb=f00d7432f56d7e4e8690d8392dffd63317759d33;hp=d77179db4bc692ea9086575e3abba64892698acd;hpb=1fc81821e3bc450a6b95588ebe7c90bf6363bed9;p=doldaconnect.git

diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index d77179d..a7188b1 100644
--- a/daemon/fnet-dc.c
+++ b/daemon/fnet-dc.c
@@ -136,7 +136,7 @@ struct dcpeer
     int extended;
     int direction;    /* Using the constants from transfer.h */
     int compress;
-    int hascurpos, notthl;
+    int hascurpos, fetchingtthl, notthl;
     struct tigertreehash tth;
     void *cprsdata;
     char *key;
@@ -676,6 +676,7 @@ static void requestfile(struct dcpeer *peer)
 	    sendadc(peer->sk, "0");
 	    sendadc(peer->sk, "-1");
 	    qstr(peer->sk, "|");
+	    peer->fetchingtthl = 1;
 	    return;
 	}
     }
@@ -1637,6 +1638,13 @@ static void cmd_filelength(struct socket *sk, struct dcpeer *peer, char *cmd, ch
 
 static void cmd_error(struct socket *sk, struct dcpeer *peer, char *cmd, char *args)
 {
+    if(peer->fetchingtthl)
+    {
+	peer->fetchingtthl = 0;
+	peer->notthl = 1;
+	requestfile(peer);
+	return;
+    }
     if((peer->transfer != NULL) && (peer->transfer->dir == TRNSD_DOWN))
     {
 	transferseterror(peer->transfer, TRNSE_NOTFOUND);
@@ -1770,15 +1778,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|");
@@ -1806,6 +1809,13 @@ 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)) {
+	qstr(sk, "$MaxedOut|");
+	freedcpeer(peer);
+	return;
+    }
     if((offset != 0) && (lseek(fd, offset, SEEK_SET) < 0))
     {
 	close(fd);
@@ -1909,14 +1919,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|");
@@ -1941,6 +1947,12 @@ 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)) {
+	qstr(sk, "$MaxedOut|");
+	return;
+    }
     if((start != 0) && ((start >= sb.st_size) || (lseek(fd, start, SEEK_SET) < 0)))
     {
 	close(fd);
@@ -1993,14 +2005,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)
@@ -2040,6 +2048,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|");
@@ -2144,6 +2158,7 @@ static void cmd_adcsnd(struct socket *sk, struct dcpeer *peer, char *cmd, char *
 	peer->state = PEER_TTHL;
 	peer->totalsize = numbytes;
 	peer->curread = 0;
+	peer->fetchingtthl = 0;
 	inittigertree(&peer->tth);
 	handletthl(peer);
     } else if(!strcmp(argv[0], "file")) {