X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ffnet-dc.c;h=0009d54e3226643736927d6e6b6556e75ba92d98;hb=3ea7528f421c6fb41172073504e03c555c87d9fb;hp=cf8ee0bd6a590a1bf8dc2b6d39894de54c06985a;hpb=9a2d6cb846112bfa6fb05d70ae5aa5af058076ce;p=doldaconnect.git

diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index cf8ee0b..0009d54 100644
--- a/daemon/fnet-dc.c
+++ b/daemon/fnet-dc.c
@@ -529,14 +529,16 @@ static char **parseadc(char *args)
 		addtobuf(retbuf, NULL);
 		freeparr(retbuf);
 		return(NULL);
-	    } else if(*args == 's') {
+	    } else if((*args == 's') || (*args == ' ')) {
 		addtobuf(buf, ' ');
 	    } else if(*args == 'n') {
 		addtobuf(buf, '\n');
 	    } else if(*args == '\\') {
 		addtobuf(buf, '\\');
 	    }
+	    args++;
 	    state = 1;
+	    break;
 	}
     }
     if(buf != NULL)
@@ -573,8 +575,11 @@ static char *getadcid(struct dcpeer *peer)
 {
     char *buf;
     char *ret;
+    int isfilelist;
     
-    if((peer->transfer->hash != NULL) && isdchash(peer->transfer->hash) && supports(peer, "tthf"))
+    if(!wcscmp(peer->transfer->path, L"files.xml") || !wcscmp(peer->transfer->path, L"files.xml.bz2") || !wcscmp(peer->transfer->path, L"MyList.DcLst"))
+	isfilelist = 1;
+    if(!isfilelist && (peer->transfer->hash != NULL) && isdchash(peer->transfer->hash) && supports(peer, "tthf"))
     {
 	buf = base32encode(peer->transfer->hash->buf, 24);
 	ret = sprintf2("TTH/%.39s", buf);
@@ -1473,7 +1478,8 @@ static void cmd_direction(struct socket *sk, struct dcpeer *peer, char *cmd, cha
 	    freedcpeer(peer);
 	    return;
 	}
-	requestfile(peer);
+	if(peer->direction == TRNSD_DOWN)
+	    requestfile(peer);
     } else {
 	if(peer->wcsname == NULL)
 	{
@@ -2051,8 +2057,9 @@ static void handletthl(struct dcpeer *peer)
     {
 	pushtigertree(&peer->tth, peer->inbuf);
 	memmove(peer->inbuf, peer->inbuf + 24, peer->inbufdata -= 24);
+	peer->curread += 24;
     }
-    if((peer->curread += 24) >= peer->totalsize)
+    if(peer->curread >= peer->totalsize)
     {
 	peer->state = PEER_CMD;
 	synctigertree(&peer->tth);
@@ -2110,6 +2117,12 @@ static void cmd_adcsnd(struct socket *sk, struct dcpeer *peer, char *cmd, char *
 	    goto out;
 	}
 	startdl(peer);
+	if(peer->inbufdata > 0)
+	{
+	    sockpushdata(sk, peer->inbuf, peer->inbufdata);
+	    peer->inbufdata = 0;
+	    transread(sk, peer);
+	}
     } else {
 	/* We certainly didn't request this...*/
 	freedcpeer(peer);
@@ -2137,6 +2150,12 @@ static void cmd_sending(struct socket *sk, struct dcpeer *peer, char *cmd, char
 	return;
     }
     startdl(peer);
+    if(peer->inbufdata > 0)
+    {
+	sockpushdata(sk, peer->inbuf, peer->inbufdata);
+	peer->inbufdata = 0;
+	transread(sk, peer);
+    }
 }
 
 /*
@@ -2967,15 +2986,15 @@ static void peerread(struct socket *sk, struct dcpeer *peer)
 	    newqcmd(&peer->queue, peer->inbuf);
 	    for(cmd = peercmds; cmd->handler != NULL; cmd++)
 	    {
-		if(!memcmp(peer->inbuf, cmd->name, strlen(cmd->name)) && (peer->inbuf[strlen(cmd->name)] == 0))
+		if(!memcmp(peer->inbuf, cmd->name, strlen(cmd->name)) && ((peer->inbuf[strlen(cmd->name)] == ' ') || (peer->inbuf[strlen(cmd->name)] == '|')))
 		    break;
 	    }
+	    memmove(peer->inbuf, p, peer->inbufdata -= p - peer->inbuf);
 	    if(cmd->stop)
 	    {
 		peer->state = PEER_STOP;
 		break;
 	    }
-	    memmove(peer->inbuf, p, peer->inbufdata -= p - peer->inbuf);
 	}
     } else if(peer->state == PEER_TTHL) {
 	handletthl(peer);