X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ffnet-dc.c;h=350255e70bbf9d5341548a2eb11140c63d6896cb;hb=504ba854ababeea74e726976825959f068c1b48b;hp=811b5e0480822a9b2a324de28db29245c9d5c152;hpb=0d8c93cb58054c3998b023e9e5ab53f15f9cb2fc;p=doldaconnect.git

diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index 811b5e0..350255e 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, dcppemu;
     char *nativename;
     char *nativenick;
 };
@@ -128,15 +128,16 @@ struct dcpeer
     size_t inbufdata, inbufsize;
     size_t curread, totalsize;
     int freeing;
+    struct timer *timeout;
     struct qcommand *queue;
     struct transfer *transfer;
     int state;
     int ptclose;      /* Close after transfer is complete */
     int accepted;     /* If false, we connected, otherwise, we accepted */
-    int extended;
+    int extended, dcppemu;
     int direction;    /* Using the constants from transfer.h */
     int compress;
-    int hascurpos, notthl;
+    int hascurpos, fetchingtthl, notthl;
     struct tigertreehash tth;
     void *cprsdata;
     char *key;
@@ -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;
@@ -575,8 +584,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);
@@ -622,20 +634,18 @@ static void sendmynick(struct dcpeer *peer)
 
 static void sendpeerlock(struct dcpeer *peer)
 {
-#ifdef DCPP_MASQUERADE
-    qstrf(peer->sk, "$Lock EXTENDEDPROTOCOLABCABCABCABCABCABC Pk=DCPLUSPLUS0.674ABCABC|");
-#else
-    qstrf(peer->sk, "$Lock EXTENDEDPROTOCOLABCABCABCABCABCABC Pk=DOLDA%sABCABCABC|", VERSION);
-#endif
+    if(peer->dcppemu)
+	qstrf(peer->sk, "$Lock EXTENDEDPROTOCOLABCABCABCABCABCABC Pk=DCPLUSPLUS0.674ABCABC|");
+    else
+	qstrf(peer->sk, "$Lock EXTENDEDPROTOCOLABCABCABCABCABCABC Pk=DOLDA%sABCABCABC|", VERSION);
 }
 
 static void sendsupports(struct dcpeer *peer)
 {
-#ifdef DCPP_MASQUERADE
-    qstr(peer->sk, "$Supports MiniSlots XmlBZList ADCGet TTHL TTHF GetZBlock ZLIG |");
-#else
-    qstr(peer->sk, "$Supports MiniSlots XmlBZList ADCGet TTHL TTHF GetZBlock ZLIG|");
-#endif
+    if(peer->dcppemu)
+	qstr(peer->sk, "$Supports MiniSlots XmlBZList ADCGet TTHL TTHF GetZBlock ZLIG |");
+    else
+	qstr(peer->sk, "$Supports MiniSlots XmlBZList ADCGet TTHL TTHF GetZBlock ZLIG|");
 }
 
 static void requestfile(struct dcpeer *peer)
@@ -673,6 +683,7 @@ static void requestfile(struct dcpeer *peer)
 	    sendadc(peer->sk, "0");
 	    sendadc(peer->sk, "-1");
 	    qstr(peer->sk, "|");
+	    peer->fetchingtthl = 1;
 	    return;
 	}
     }
@@ -726,23 +737,30 @@ static void sendmyinfo(struct socket *sk, struct fnetnode *fn)
     struct dchub *hub;
     char *buf;
     struct fnetnode *cfn;
-    int numhubs;
+    int hn1, hn2, hn3;
     
     hub = fn->data;
     qstrf(sk, "$MyINFO $ALL %s ", hub->nativenick);
     buf = tr(icswcstombs(confgetstr("dc", "desc"), DCCHARSET, "Charset_conv_failure"), "$_|_");
     qstrf(sk, "%s", buf);
-    numhubs = 0;
+    hn1 = hn2 = hn3 = 0;
     for(cfn = fnetnodes; cfn != NULL; cfn = cfn->next)
     {
 	if((cfn->state == FNN_EST) || (cfn->state == FNN_HS))
-	    numhubs++;
+	{
+	    if(cfn->regstatus == FNNS_OP)
+		hn3++;
+	    else if(cfn->regstatus == FNNS_REG)
+		hn2++;
+	    else
+		hn1++;
+	}
     }
-    qstrf(sk, "<%s V:%s,M:%c,H:%i/0/0,S:%i>",
-	  DCIDTAG,
-	  DCIDTAGV,
+    qstrf(sk, "<%s V:%s,M:%c,H:%i/%i/%i,S:%i>",
+	  (hub->dcppemu)?"++":"Dolda",
+	  (hub->dcppemu)?"0.674":VERSION,
 	  (tcpsock == NULL)?'P':'A',
-	  numhubs,
+	  hn1, hn2, hn3,
 	  confgetint("transfer", "slots")
 	  );
     qstrf(sk, "$ $");
@@ -787,11 +805,10 @@ static void cmd_lock(struct socket *sk, struct fnetnode *fn, char *cmd, char *ar
 	*(p++) = 0;
     if(hub->extended)
     {
-#ifdef DCPP_MASQUERADE
-	qstrf(sk, "$Supports UserCommand NoGetINFO NoHello UserIP2 TTHSearch GetZBlock |");
-#else
-	qstrf(sk, "$Supports UserCommand NoGetINFO NoHello UserIP2 TTHSearch GetZBlock|");
-#endif
+	if(hub->dcppemu)
+	    qstrf(sk, "$Supports UserCommand NoGetINFO NoHello UserIP2 TTHSearch GetZBlock |");
+	else
+	    qstrf(sk, "$Supports UserCommand NoGetINFO NoHello UserIP2 TTHSearch GetZBlock|");
     }
     key = dcmakekey(args);
     qstrf(sk, "$Key %s|", key);
@@ -993,7 +1010,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,9 +1440,38 @@ 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;
+    wchar_t *pw;
+    char *mbspw;
+    
+    hub = fn->data;
+    pw = wpfind(fn->args, L"password");
+    if((pw == NULL) || ((mbspw = icwcstombs(pw, DCCHARSET)) == NULL))
+    {
+	killfnetnode(fn);
+	return;
+    }
+    qstrf(sk, "$MyPass %s|", mbspw);
+    free(mbspw);
+    fn->regstatus = FNNS_REG;
+    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;
+    fn->regstatus = FNNS_OP;
+    hubhandleaction(sk, fn, cmd, args);
+}
+
 static void cmd_mynick(struct socket *sk, struct dcpeer *peer, char *cmd, char *args)
 {
     struct dcexppeer *expect;
+    struct dchub *hub;
 
     if(peer->nativename != NULL)
 	free(peer->nativename);
@@ -1448,8 +1494,10 @@ static void cmd_mynick(struct socket *sk, struct dcpeer *peer, char *cmd, char *
 	{
 	    peer->fn = NULL;
 	} else {
+	    hub = expect->fn->data;
 	    peer->fn = expect->fn;
 	    getfnetnode(peer->fn);
+	    peer->dcppemu = hub->dcppemu;
 	    freeexppeer(expect);
 	}
     }
@@ -1475,7 +1523,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)
 	{
@@ -1556,6 +1605,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;
@@ -1564,6 +1615,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;
@@ -1572,6 +1625,7 @@ static void startul(struct dcpeer *peer)
 static void cmd_filelength(struct socket *sk, struct dcpeer *peer, char *cmd, char *args)
 {
     int size;
+    struct transfer *transfer;
     
     if(peer->transfer == NULL)
     {
@@ -1582,7 +1636,9 @@ static void cmd_filelength(struct socket *sk, struct dcpeer *peer, char *cmd, ch
     if(peer->transfer->size != size)
     {
 	transfersetsize(peer->transfer, size);
+	transfer = peer->transfer;
 	freedcpeer(peer);
+	trytransferbypeer(transfer->fnet, transfer->peerid);
 	return;
     }
     startdl(peer);
@@ -1591,6 +1647,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);
@@ -1724,15 +1787,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|");
@@ -1760,6 +1818,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);
@@ -1863,14 +1929,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|");
@@ -1895,6 +1957,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);
@@ -1947,14 +2016,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)
@@ -1994,6 +2059,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|");
@@ -2057,6 +2128,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);
@@ -2095,9 +2168,12 @@ 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;
+	peer->fetchingtthl = 0;
 	inittigertree(&peer->tth);
 	handletthl(peer);
     } else if(!strcmp(argv[0], "file")) {
@@ -2467,6 +2543,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}
 };
 
@@ -2563,10 +2641,13 @@ 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);
 		    socksettos(peer->sk, confgetint("fnet", "fnptos"));
+		    transfer->flags.b.minislot = 0;
 		    peer->sk->writecb = NULL;
 		}
 	    }
@@ -2818,10 +2899,20 @@ static int hubsetnick(struct fnetnode *fn, wchar_t *newnick)
 static struct dchub *newdchub(struct fnetnode *fn)
 {
     struct dchub *new;
+    wchar_t *emu;
     
     new = smalloc(sizeof(*new));
     memset(new, 0, sizeof(*new));
     fn->data = new;
+    if(confgetint("dc", "dcppemu"))
+	new->dcppemu = 1;
+    if((emu = wpfind(fn->args, L"dcppemu")) != NULL)
+    {
+	if(*emu == L'y')
+	    new->dcppemu = 1;
+	if(*emu == L'n')
+	    new->dcppemu = 0;
+    }
     if(hubsetnick(fn, fn->mynick))
 	fnetsetnick(fn, L"DoldaConnectUser-IN");
     /* IN as in Invalid Nick */
@@ -2837,6 +2928,8 @@ static struct dcpeer *newdcpeer(struct socket *sk)
     new->transfer = NULL;
     getsock(sk);
     new->sk = sk;
+    if(confgetint("dc", "dcppemu"))
+	new->dcppemu = 1;
     new->next = peers;
     new->prev = NULL;
     if(peers != NULL)
@@ -2866,6 +2959,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;
@@ -2982,15 +3077,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);
@@ -3005,20 +3100,24 @@ static void peererror(struct socket *sk, int err, struct dcpeer *peer)
 static void peerconnect(struct socket *sk, int err, struct fnetnode *fn)
 {
     struct dcpeer *peer;
+    struct dchub *hub;
     
     if(err != 0)
     {
 	putfnetnode(fn);
 	return;
     }
+    hub = fn->data;
     peer = newdcpeer(sk);
     peer->fn = fn;
     peer->accepted = 0;
+    peer->dcppemu = hub->dcppemu;
     sk->readcb = (void (*)(struct socket *, void *))peerread;
     sk->errcb = (void (*)(struct socket *, int, void *))peererror;
     sk->data = peer;
     socksettos(sk, confgetint("fnet", "fnptos"));
     putsock(sk);
+    peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
     sendmynick(peer);
     sendpeerlock(peer);
 }
@@ -3033,6 +3132,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)
@@ -3214,7 +3314,10 @@ static void updatexmllist(void)
     for(i = 0; i < sizeof(cidbuf) - 1; i++)
 	cidbuf[i] = (rand() % ('Z' - 'A' + 1)) + 'A';
     cidbuf[i] = 0;
-    fprintf(fs, "<FileListing Version=\"1\" CID=\"%s\" Base=\"/\" Generator=\"%s\">\r\n", cidbuf, DCIDFULL);
+    if(confgetint("dc", "dcppemu"))
+	fprintf(fs, "<FileListing Version=\"1\" CID=\"%s\" Base=\"/\" Generator=\"DC++ 0.674\">\r\n", cidbuf);
+    else
+	fprintf(fs, "<FileListing Version=\"1\" CID=\"%s\" Base=\"/\" Generator=\"%s\">\r\n", cidbuf, "DoldaConnect" VERSION);
     
     node = shareroot->child;
     lev = 0;
@@ -3259,11 +3362,10 @@ static void updatexmllist(void)
 	}
     }
     
-#ifdef DCPP_MASQUERADE
-    fprintf(fs, "</FileListing>");
-#else
-    fprintf(fs, "</FileListing>\r\n");
-#endif
+    if(confgetint("dc", "dcppemu"))
+	fprintf(fs, "</FileListing>");
+    else
+	fprintf(fs, "</FileListing>\r\n");
     fclose(fs);
 }
 
@@ -3392,6 +3494,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);
@@ -3501,6 +3606,7 @@ static struct configvar myvars[] =
     {CONF_VAR_STRING, "email", {.str = L"spam@spam.org"}},
     {CONF_VAR_INT, "udpport", {.num = 0}},
     {CONF_VAR_INT, "tcpport", {.num = 0}},
+    {CONF_VAR_BOOL, "dcppemu", {.num = 0}},
     {CONF_VAR_END}
 };