X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ffnet-dc.c;h=7175259fc2399bca02d6c047ecee8e0067927a3d;hb=c9b3ad74a6f7fbf4559b055824cf85106cf45c1a;hp=d6ccb77a696d6dfeae6c3bf61303b8040663955d;hpb=e52006fed4c97009766abdd4a1b15ac79c6830e8;p=doldaconnect.git

diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index d6ccb77..7175259 100644
--- a/daemon/fnet-dc.c
+++ b/daemon/fnet-dc.c
@@ -106,7 +106,7 @@ struct dchub
     char *inbuf;
     size_t inbufdata, inbufsize;
     struct qcommand *queue;
-    int extended;
+    int extended, isop;
     char *nativename;
     char *nativenick;
 };
@@ -575,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);
@@ -993,7 +996,7 @@ static void cmd_forcemove(struct socket *sk, struct fnetnode *fn, char *cmd, cha
     } else {
 	freeargs = 0;
     }
-    if((newfn = fnetinitconnect(L"dc", args)) != NULL)
+    if((newfn = fnetinitconnect(L"dc", args, NULL)) != NULL)
     {
 	linkfnetnode(newfn);
 	putfnetnode(newfn);
@@ -1423,6 +1426,37 @@ static void cmd_usercommand(struct socket *sk, struct fnetnode *fn, char *cmd, c
     /* Do nothing for now. */
 }
 
+static void cmd_getpass(struct socket *sk, struct fnetnode *fn, char *cmd, char *args)
+{
+    struct dchub *hub;
+    struct wcspair *arg;
+    char *mbspw;
+    
+    hub = fn->data;
+    for(arg = fn->args; arg != NULL; arg = arg->next)
+    {
+	if(!wcscmp(arg->key, L"password"))
+	    break;
+    }
+    if((arg == NULL) || ((mbspw = icwcstombs(arg->val, DCCHARSET)) == NULL))
+    {
+	killfnetnode(fn);
+	return;
+    }
+    qstrf(sk, "$MyPass %s|", mbspw);
+    free(mbspw);
+    hubhandleaction(sk, fn, cmd, args);
+}
+
+static void cmd_logedin(struct socket *sk, struct fnetnode *fn, char *cmd, char *args)
+{
+    struct dchub *hub;
+    
+    hub = fn->data;
+    hub->isop = 1;
+    hubhandleaction(sk, fn, cmd, args);
+}
+
 static void cmd_mynick(struct socket *sk, struct dcpeer *peer, char *cmd, char *args)
 {
     struct dcexppeer *expect;
@@ -1475,7 +1509,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)
 	{
@@ -2146,6 +2181,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);
+    }
 }
 
 /*
@@ -2461,6 +2502,8 @@ struct command hubcmds[] =
     {"$To:", cc(cmd_to)},
     {"$SR", cc(cmd_sr)},
     {"$UserCommand", cc(cmd_usercommand)},
+    {"$GetPass", cc(cmd_getpass)},
+    {"$LogedIn", cc(cmd_logedin)}, /* sic */
     {NULL, NULL}
 };
 
@@ -2976,15 +3019,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);