Fixed segfault while processing consecutive DC peer commands.

[doldaconnect.git] / daemon / fnet-dc.c

diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index dc26782..152de4a 100644 (file)
--- a/daemon/fnet-dc.c
+++ b/daemon/fnet-dc.c
@@ -135,7 +135,7 @@ struct dcpeer
     char *inbuf;
     size_t inbufdata, inbufsize;
     off_t curread, totalsize;
-    int freeing;
+    int close;
     struct timer *timeout;
     struct qcmdqueue queue;
     struct transfer *transfer;
@@ -222,27 +222,42 @@ static char *dcmakekey(char *lock)
     return(key);
 }
 
-static char *pathnmdc2adc(char *path)
+static wchar_t *nmdc2path(char *nmdc, char *charset)
 {
-    char *ret;
-    size_t retsize, retdata;
+    wchar_t *ret, *p;
     
-    if(!strcmp(path, "files.xml") || !strcmp(path, "files.xml.bz2") || !strcmp(path, "MyList.DcLst"))
-       return(sstrdup(path));
-    ret = NULL;
-    retsize = retdata = 0;
-    addtobuf(ret, '/');
-    for(; *path; path++)
-    {
-       if(*path == '\\')
-           addtobuf(ret, '/');
-       else
-           addtobuf(ret, *path);
+    if((ret = icmbstowcs(nmdc, charset)) == NULL)
+       return(NULL);
+    for(p = ret; *p != L'\0'; p++) {
+       if(*p == L'\\')
+           *p = L'/';
+    }
+    return(ret);
+}
+
+static char *path2nmdc(wchar_t *path, char *charset)
+{
+    char *ret, *p;
+    
+    if((ret = icwcstombs(path, charset)) == NULL)
+       return(NULL);
+    for(p = ret; *p; p++) {
+       if(*p == '/')
+           *p = '\\';
     }
-    addtobuf(ret, 0);
     return(ret);
 }
 
+static wchar_t *adc2path(char *adc)
+{
+    return(icmbstowcs(adc, "UTF-8"));
+}
+
+static char *path2adc(wchar_t *path)
+{
+    return(icwcstombs(path, "UTF-8"));
+}
+
 static int isdchash(struct hash *hash)
 {
     if(wcscmp(hash->algo, L"TTH"))
@@ -635,10 +650,7 @@ static char *getadcid(struct dcpeer *peer)
        ret = sprintf2("TTH/%.39s", buf);
        free(buf);
     } else {
-       if((buf = icwcstombs(peer->transfer->path, "UTF-8")) == NULL)
-           return(NULL);
-       ret = pathnmdc2adc(buf);
-       free(buf);
+       ret = path2adc(peer->transfer->path);
     }
     return(ret);
 }
@@ -700,16 +712,17 @@ static void requestfile(struct dcpeer *peer)
     if(peer->transfer->size == -1)
     {
        /* Use DCCHARSET for $Get paths until further researched... */
-       if((buf = icswcstombs(peer->transfer->path, DCCHARSET, NULL)) == NULL)
+       if((buf = path2nmdc(peer->transfer->path, DCCHARSET)) == NULL)
        {
            transferseterror(peer->transfer, TRNSE_NOTFOUND);
-           freedcpeer(peer);
+           peer->close = 1;
            return;
        }
        /* The transfer will be restarted later from
         * cmd_filelength when it detects that the sizes
         * don't match. */
        qstrf(peer->sk, "$Get %s$1|", buf);
+       free(buf);
        return;
     }
     if((peer->transfer->hash == NULL) && !peer->notthl)
@@ -721,7 +734,7 @@ static void requestfile(struct dcpeer *peer)
            if((buf = getadcid(peer)) == NULL)
            {
                transferseterror(peer->transfer, TRNSE_NOTFOUND);
-               freedcpeer(peer);
+               peer->close = 1;
                return;
            }
            sendadc(peer->sk, buf);
@@ -738,7 +751,7 @@ static void requestfile(struct dcpeer *peer)
        if(forkfilter(peer->transfer))
        {
            flog(LOG_WARNING, "could not fork filter for transfer %i: %s", peer->transfer->id, strerror(errno));
-           freedcpeer(peer);
+           peer->close = 1;
            return;
        }
        CBREG(peer->transfer, trans_filterout, (int (*)(struct transfer *, wchar_t *, wchar_t *, void *))trresumecb, NULL, peer);
@@ -751,7 +764,7 @@ static void requestfile(struct dcpeer *peer)
        if((buf = getadcid(peer)) == NULL)
        {
            transferseterror(peer->transfer, TRNSE_NOTFOUND);
-           freedcpeer(peer);
+           peer->close = 1;
            return;
        }
        sendadc(peer->sk, buf);
@@ -760,22 +773,24 @@ static void requestfile(struct dcpeer *peer)
        sendadcf(peer->sk, "%ji", (intmax_t)(peer->transfer->size - peer->transfer->curpos));
        qstr(peer->sk, "|");
     } else if(supports(peer, "xmlbzlist")) {
-       if((buf = icswcstombs(peer->transfer->path, "UTF-8", NULL)) == NULL)
+       if((buf = path2nmdc(peer->transfer->path, "UTF-8")) == NULL)
        {
            transferseterror(peer->transfer, TRNSE_NOTFOUND);
-           freedcpeer(peer);
+           peer->close = 1;
            return;
        }
        qstrf(peer->sk, "$UGetBlock %ji %ji %s|", (intmax_t)peer->transfer->curpos, (intmax_t)(peer->transfer->size - peer->transfer->curpos), buf);
+       free(buf);
     } else {
        /* Use DCCHARSET for $Get paths until further researched... */
-       if((buf = icswcstombs(peer->transfer->path, DCCHARSET, NULL)) == NULL)
+       if((buf = path2nmdc(peer->transfer->path, DCCHARSET)) == NULL)
        {
            transferseterror(peer->transfer, TRNSE_NOTFOUND);
-           freedcpeer(peer);
+           peer->close = 1;
            return;
        }
        qstrf(peer->sk, "$Get %s$%ji|", buf, (intmax_t)peer->transfer->curpos + 1);
+       free(buf);
     }
 }
 
@@ -1458,7 +1473,7 @@ static void cmd_sr(struct socket *sk, struct fnetnode *fn, char *cmd, char *args
     if((wnick = icmbstowcs(nick, hub->charset)) == NULL)
        return;
     /* Use DCCHARSET in $Get paths until further researched... */
-    if((wfile = icmbstowcs(filename, DCCHARSET)) == NULL)
+    if((wfile = nmdc2path(filename, DCCHARSET)) == NULL)
     {
        free(wnick);
        return;
@@ -1561,7 +1576,7 @@ static void cmd_mynick(struct socket *sk, struct dcpeer *peer, char *cmd, char *
        free(peer->wcsname);
     if((peer->wcsname = icmbstowcs(peer->nativename, peer->charset)) == NULL)
     {
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     if(peer->accepted)
@@ -1601,7 +1616,7 @@ static void cmd_direction(struct socket *sk, struct dcpeer *peer, char *cmd, cha
     {
        if((peer->transfer == NULL) || (mydir != peer->direction))
        {
-           freedcpeer(peer);
+           peer->close = 1;
            return;
        }
        if(peer->direction == TRNSD_DOWN)
@@ -1609,7 +1624,7 @@ static void cmd_direction(struct socket *sk, struct dcpeer *peer, char *cmd, cha
     } else {
        if(peer->wcsname == NULL)
        {
-           freedcpeer(peer);
+           peer->close = 1;
            return;
        }
        peer->direction = mydir;
@@ -1617,14 +1632,14 @@ static void cmd_direction(struct socket *sk, struct dcpeer *peer, char *cmd, cha
        {
            if(confgetint("transfer", "ulquota") && hasupload(&dcnet, peer->wcsname))
            {
-               freedcpeer(peer);
+               peer->close = 1;
                return;
            }
            transfer = newupload(peer->fn, &dcnet, peer->wcsname, &dctransfer, peer);
        } else {
            if((transfer = finddownload(peer->wcsname)) == NULL)
            {
-               freedcpeer(peer);
+               peer->close = 1;
                return;
            }
            transferattach(transfer, &dctransfer, peer);
@@ -1657,7 +1672,7 @@ static void cmd_peerlock(struct socket *sk, struct dcpeer *peer, char *cmd, char
     {
        if(peer->wcsname == NULL)
        {
-           freedcpeer(peer);
+           peer->close = 1;
            return;
        }
        sendmynick(peer);
@@ -1668,7 +1683,7 @@ static void cmd_peerlock(struct socket *sk, struct dcpeer *peer, char *cmd, char
        {
            if(confgetint("transfer", "ulquota") && hasupload(&dcnet, peer->wcsname))
            {
-               freedcpeer(peer);
+               peer->close = 1;
                return;
            }
            peer->direction = TRNSD_UP;
@@ -1721,7 +1736,7 @@ static void cmd_filelength(struct socket *sk, struct dcpeer *peer, char *cmd, ch
     
     if(peer->transfer == NULL)
     {
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     size = strtoll(args, NULL, 10);
@@ -1729,7 +1744,8 @@ static void cmd_filelength(struct socket *sk, struct dcpeer *peer, char *cmd, ch
     {
        transfersetsize(peer->transfer, size);
        transfer = peer->transfer;
-       freedcpeer(peer);
+       peer->close = 1;
+       resettransfer(transfer);
        trytransferbypeer(transfer->fnet, transfer->peerid);
        return;
     }
@@ -1752,7 +1768,7 @@ static void cmd_error(struct socket *sk, struct dcpeer *peer, char *cmd, char *a
        resettransfer(peer->transfer);
        return;
     }
-    freedcpeer(peer);
+    peer->close = 1;
 }
 
 static void cmd_maxedout(struct socket *sk, struct dcpeer *peer, char *cmd, char *args)
@@ -1763,7 +1779,7 @@ static void cmd_maxedout(struct socket *sk, struct dcpeer *peer, char *cmd, char
        resettransfer(peer->transfer);
        return;
     }
-    freedcpeer(peer);
+    peer->close = 1;
 }
 
 static struct
@@ -1857,28 +1873,30 @@ static void cmd_get(struct socket *sk, struct dcpeer *peer, char *cmd, char *arg
     
     if(peer->transfer == NULL)
     {
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     if((p = strchr(args, '$')) == NULL)
     {
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     *(p++) = 0;
     if((offset = (strtoll(p, NULL, 10) - 1)) < 0)
     {
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     if(((fd = openfilelist(args)) < 0) && (errno != 0))
     {
        qstr(sk, "$Error Could not send file list|");
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     } else if(fd >= 0) {
-       if((buf2 = icsmbstowcs(args, DCCHARSET, NULL)) != NULL)
+       if((buf2 = nmdc2path(args, DCCHARSET)) != NULL) {
            transfersetpath(peer->transfer, buf2);
+           free(buf2);
+       }
        peer->transfer->flags.b.minislot = 1;
     }
     if(fd < 0)
@@ -1887,13 +1905,13 @@ static void cmd_get(struct socket *sk, struct dcpeer *peer, char *cmd, char *arg
        if((node = resdcpath(args, DCCHARSET, '\\')) == NULL)
        {
            qstrf(sk, "$Error File not in share|");
-           freedcpeer(peer);
+           peer->close = 1;
            return;
        }
        if((fd = opensharecache(node)) < 0)
        {
            qstrf(sk, "$Error %s|", strerror(errno));
-           freedcpeer(peer);
+           peer->close = 1;
            return;
        }
        buf = getfspath(node);
@@ -1908,7 +1926,7 @@ static void cmd_get(struct socket *sk, struct dcpeer *peer, char *cmd, char *arg
        close(fd);
        flog(LOG_WARNING, "could not stat file %ls: %s", node->name, strerror(errno));
        qstrf(sk, "$Error|");
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     if(sb.st_size < 65536)
@@ -1916,14 +1934,14 @@ static void cmd_get(struct socket *sk, struct dcpeer *peer, char *cmd, char *arg
     if(!peer->transfer->flags.b.minislot && (slotsleft() < 1)) {
        close(fd);
        qstr(sk, "$MaxedOut|");
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     if((offset != 0) && (lseek(fd, offset, SEEK_SET) < 0))
     {
        close(fd);
        qstrf(sk, "$Error Offset out of range|");
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     lesk = wrapsock(fd);
@@ -1936,12 +1954,12 @@ static void cmd_send(struct socket *sk, struct dcpeer *peer, char *cmd, char *ar
 {
     if(peer->transfer == NULL)
     {
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     if(peer->transfer->localend == NULL)
     {
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     peer->ptclose = 1;
@@ -1989,13 +2007,13 @@ static void cmd_getblock(struct socket *sk, struct dcpeer *peer, char *cmd, char
     
     if(peer->transfer == NULL)
     {
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     p = args;
     if((p2 = strchr(p, ' ')) == NULL)
     {
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     *(p2++) = 0;
@@ -2003,7 +2021,7 @@ static void cmd_getblock(struct socket *sk, struct dcpeer *peer, char *cmd, char
     p = p2;
     if((p2 = strchr(p, ' ')) == NULL)
     {
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     *(p2++) = 0;
@@ -2021,8 +2039,10 @@ static void cmd_getblock(struct socket *sk, struct dcpeer *peer, char *cmd, char
        qstr(sk, "$Error Could not send file list|");
        return;
     } else if(fd >= 0) {
-       if((buf2 = icsmbstowcs(args, charset, NULL)) != NULL)
+       if((buf2 = nmdc2path(args, charset)) != NULL) {
            transfersetpath(peer->transfer, buf2);
+           free(buf2);
+       }
        peer->transfer->flags.b.minislot = 1;
     }
     if(fd < 0)
@@ -2086,17 +2106,17 @@ static void cmd_adcget(struct socket *sk, struct dcpeer *peer, char *cmd, char *
     
     if(peer->transfer == NULL)
     {
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     if((argv = parseadc(args)) == NULL)
     {
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     if(parrlen(argv) < 4)
     {
-       freedcpeer(peer);
+       peer->close = 1;
        goto out;
     }
     start = strtoll(argv[2], NULL, 10);
@@ -2108,7 +2128,7 @@ static void cmd_adcget(struct socket *sk, struct dcpeer *peer, char *cmd, char *
        qstr(sk, "$Error Could not send file list|");
        goto out;
     } else if(fd >= 0) {
-       if((wbuf = icsmbstowcs(argv[1], "UTF-8", NULL)) != NULL)
+       if((wbuf = adc2path(argv[1])) != NULL)
            transfersetpath(peer->transfer, wbuf);
        peer->transfer->flags.b.minislot = 1;
     }
@@ -2239,17 +2259,17 @@ static void cmd_adcsnd(struct socket *sk, struct dcpeer *peer, char *cmd, char *
     
     if(peer->transfer == NULL)
     {
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     if((argv = parseadc(args)) == NULL)
     {
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     if(parrlen(argv) < 4)
     {
-       freedcpeer(peer);
+       peer->close = 1;
        goto out;
     }
     start = strtoll(argv[2], NULL, 10);
@@ -2259,7 +2279,7 @@ static void cmd_adcsnd(struct socket *sk, struct dcpeer *peer, char *cmd, char *
        if((start != 0) || (numbytes % 24 != 0))
        {
            /* Weird. Bail out. */
-           freedcpeer(peer);
+           peer->close = 1;
            goto out;
        }
        if(peer->timeout != NULL)
@@ -2273,13 +2293,13 @@ static void cmd_adcsnd(struct socket *sk, struct dcpeer *peer, char *cmd, char *
     } else if(!strcmp(argv[0], "file")) {
        if(start != peer->transfer->curpos)
        {
-           freedcpeer(peer);
+           peer->close = 1;
            goto out;
        }
        if(start + numbytes != peer->transfer->size)
        {
            transfersetsize(peer->transfer, start + numbytes);
-           freedcpeer(peer);
+           peer->close = 1;
            goto out;
        }
        startdl(peer);
@@ -2291,7 +2311,7 @@ static void cmd_adcsnd(struct socket *sk, struct dcpeer *peer, char *cmd, char *
        }
     } else {
        /* We certainly didn't request this...*/
-       freedcpeer(peer);
+       peer->close = 1;
        goto out;
     }
     
@@ -2305,14 +2325,14 @@ static void cmd_sending(struct socket *sk, struct dcpeer *peer, char *cmd, char
     
     if(peer->transfer == NULL)
     {
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     numbytes = strtoll(args, NULL, 10);
     if(peer->transfer->size - peer->transfer->curpos != numbytes)
     {
        transfersetsize(peer->transfer, peer->transfer->curpos + numbytes);
-       freedcpeer(peer);
+       peer->close = 1;
        return;
     }
     startdl(peer);
@@ -2672,10 +2692,8 @@ static struct command peercmds[] =
 static void dctransdetach(struct transfer *transfer, struct dcpeer *peer)
 {
     CBUNREG(transfer, trans_filterout, peer);
-    if(peer->freeing)
-       return;
     peer->transfer = NULL;
-    freedcpeer(peer);
+    peer->close = 1;
 }
 
 static void dctransgotdata(struct transfer *transfer, struct dcpeer *peer)
@@ -2905,7 +2923,7 @@ static void udpread(struct socket *sk, void *data)
        *p2 = 0;
        hubaddr.sin_port = htons(atoi(p));
        /* Use DCCHARSET in $Get paths until further researched... */
-       if((wfile = icmbstowcs(filename, DCCHARSET)) == NULL)
+       if((wfile = nmdc2path(filename, DCCHARSET)) == NULL)
        {
            free(buf);
            return;
@@ -3013,8 +3031,6 @@ static void hubread(struct socket *sk, struct fnetnode *fn)
     }
     if(hub->queue.size > 1000)
        sk->ignread = 1;
-    else
-       sk->ignread = 0;
 }
 
 static void huberr(struct socket *sk, int err, struct fnetnode *fn)
@@ -3112,7 +3128,6 @@ static void freedcpeer(struct dcpeer *peer)
     int i;
     struct qcommand *qcmd;
     
-    peer->freeing = 1;
     if(peers == peer)
        peers = peer->next;
     if(peer->next != NULL)
@@ -3211,7 +3226,7 @@ static wchar_t *dcbasename(wchar_t *filename)
 {
     wchar_t *ret;
     
-    if((ret = wcsrchr(filename, L'\\')) != NULL)
+    if((ret = wcsrchr(filename, L'/')) != NULL)
        return(ret + 1);
     return(filename);
 }
@@ -3245,8 +3260,6 @@ static void peerread(struct socket *sk, struct dcpeer *peer)
 
     if((newbuf = sockgetinbuf(sk, &datalen)) == NULL)
        return;
-    if(peer->inbufdata > 500000) /* Discard possibly malicious data */
-       peer->inbufdata = 0;
     sizebuf2(peer->inbuf, peer->inbufdata + datalen, 1);
     memcpy(peer->inbuf + peer->inbufdata, newbuf, datalen);
     free(newbuf);
@@ -3271,15 +3284,15 @@ static void peerread(struct socket *sk, struct dcpeer *peer)
                peer->state = PEER_STOP;
                break;
            } else {
-               if(peer->queue.size > 1000)
+               if(peer->queue.size > 50)
                    sk->ignread = 1;
-               else
-                   sk->ignread = 0;
            }
        }
     } else if(peer->state == PEER_TTHL) {
        handletthl(peer);
     }
+    if(peer->inbufdata > 500000)
+       sk->ignread = 1;
 }
 
 static void peererror(struct socket *sk, int err, struct dcpeer *peer)
@@ -3755,9 +3768,10 @@ static int run(void)
     struct dchub *hub;
     struct dcpeer *peer, *nextpeer;
     struct qcommand *qcmd;
-    int ret;
+    int ret, quota;
     
     ret = 0;
+    quota = 20;
     for(fn = fnetnodes; fn != NULL; fn = nextfn)
     {
        nextfn = fn->next;
@@ -3766,7 +3780,7 @@ static int run(void)
        if(fn->data == NULL)
            continue;
        hub = (struct dchub *)fn->data;
-       if((qcmd = ulqcmd(&hub->queue)) != NULL)
+       while((quota > 0) && ((qcmd = ulqcmd(&hub->queue)) != NULL))
        {
            if(*qcmd->string == '$')
            {
@@ -3777,13 +3791,17 @@ static int run(void)
            }
            freeqcmd(qcmd);
            ret = 1;
-           break;
+           quota--;
        }
+       if(hub->queue.size < 1000)
+           hub->sk->ignread = 0;
+       if(quota < 1)
+           break;
     }
-    for(peer = peers; peer != NULL; peer = nextpeer)
+    quota = 20;
+    for(peer = peers; peer != NULL; peer = peer->next)
     {
-       nextpeer = peer->next;
-       if((qcmd = ulqcmd(&peer->queue)) != NULL)
+       while(!peer->close && (quota > 0) && ((qcmd = ulqcmd(&peer->queue)) != NULL))
        {
            if(peer->timeout != NULL)
                canceltimer(peer->timeout);
@@ -3792,8 +3810,18 @@ static int run(void)
                dispatchcommand(qcmd, peercmds, peer->sk, peer);
            freeqcmd(qcmd);
            ret = 1;
-           break;
+           quota--;
        }
+       if((peer->queue.size < 50) && (peer->inbufdata < 500000))
+           peer->sk->ignread = 0;
+       if(quota < 1)
+           break;
+    }
+    for(peer = peers; peer != NULL; peer = nextpeer)
+    {
+       nextpeer = peer->next;
+       if(peer->close)
+           freedcpeer(peer);
     }
     return(ret);
 }