Fixed dcbasename as well (to be removed, though).

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

diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index 87671aa..f9e3273 100644 (file)
--- a/daemon/fnet-dc.c
+++ b/daemon/fnet-dc.c
@@ -91,6 +91,7 @@ struct command
     char *name;
     void (*handler)(struct socket *sk, void *data, char *cmd, char *args);
     int stop;
+    int limit;
 };
 
 struct qcommand
@@ -102,6 +103,7 @@ struct qcommand
 struct qcmdqueue
 {
     struct qcommand *f, *l;
+    int size;
 };
 
 struct dchub
@@ -220,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'/';
     }
-    addtobuf(ret, 0);
     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 = '\\';
+    }
+    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"))
@@ -393,6 +410,7 @@ static struct qcommand *newqcmd(struct qcmdqueue *queue, char *string)
     else
        queue->l->next = new;
     queue->l = new;
+    queue->size++;
     return(new);
 }
 
@@ -404,6 +422,7 @@ static struct qcommand *ulqcmd(struct qcmdqueue *queue)
        return(NULL);
     if((queue->f = qcmd->next) == NULL)
        queue->l = NULL;
+    queue->size--;
     return(qcmd);
 }
 
@@ -631,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);
 }
@@ -696,7 +712,7 @@ 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);
@@ -706,6 +722,7 @@ static void requestfile(struct dcpeer *peer)
         * 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)
@@ -756,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);
            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);
            return;
        }
        qstrf(peer->sk, "$Get %s$%ji|", buf, (intmax_t)peer->transfer->curpos + 1);
+       free(buf);
     }
 }
 
@@ -1454,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;
@@ -1873,8 +1892,10 @@ static void cmd_get(struct socket *sk, struct dcpeer *peer, char *cmd, char *arg
        freedcpeer(peer);
        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)
@@ -2017,8 +2038,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)
@@ -2104,7 +2127,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;
     }
@@ -2628,10 +2651,10 @@ static struct command hubcmds[] =
     {"$OpList", cc(cmd_oplist)},
     {"$MyINFO", cc(cmd_myinfo)},
     {"$ForceMove", cc(cmd_forcemove)},
-    {"$Search", cc(cmd_search)},
-    {"$MultiSearch", cc(cmd_search)},
-    {"$ConnectToMe", cc(cmd_connecttome)},
-    {"$RevConnectToMe", cc(cmd_revconnecttome)},
+    {"$Search", cc(cmd_search), .limit = 100},
+    {"$MultiSearch", cc(cmd_search), .limit = 50},
+    {"$ConnectToMe", cc(cmd_connecttome), .limit = 200},
+    {"$RevConnectToMe", cc(cmd_revconnecttome), .limit = 500},
     {"$GetNetInfo", cc(cmd_getnetinfo)},
     {"$To:", cc(cmd_to)},
     {"$SR", cc(cmd_sr)},
@@ -2659,8 +2682,8 @@ static struct command peercmds[] =
     {"$GetZBlock", cc(cmd_getblock)},
     {"$UGetZBlock", cc(cmd_getblock)},
     {"$ADCGET", cc(cmd_adcget)},
-    {"$ADCSND", cc(cmd_adcsnd), 1},
-    {"$Sending", cc(cmd_sending), 1},
+    {"$ADCSND", cc(cmd_adcsnd), .stop = 1},
+    {"$Sending", cc(cmd_sending), .stop = 1},
     {NULL, NULL}
 };
 #undef cc
@@ -2901,7 +2924,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;
@@ -2977,8 +3000,9 @@ static void udpread(struct socket *sk, void *data)
 static void hubread(struct socket *sk, struct fnetnode *fn)
 {
     struct dchub *hub;
+    struct command *cmd;
     char *newbuf;
-    size_t datalen;
+    size_t datalen, cnlen;
     char *p;
     
     hub = (struct dchub *)fn->data;
@@ -2994,11 +3018,20 @@ static void hubread(struct socket *sk, struct fnetnode *fn)
     while((datalen > 0) && ((p = memchr(p, '|', datalen)) != NULL))
     {
        *(p++) = 0;
-       newqcmd(&hub->queue, hub->inbuf);
+       for(cmd = hubcmds; cmd->handler != NULL; cmd++)
+       {
+           cnlen = strlen(cmd->name);
+           if(!strncmp(hub->inbuf, cmd->name, cnlen) && ((hub->inbuf[cnlen] == ' ') || (hub->inbuf[cnlen] == 0)))
+               break;
+       }
+       if((cmd->limit == 0) || (hub->queue.size < cmd->limit))
+           newqcmd(&hub->queue, hub->inbuf);
        memmove(hub->inbuf, p, hub->inbufdata -= p - hub->inbuf);
        datalen = hub->inbufdata;
        p = hub->inbuf;
     }
+    if(hub->queue.size > 1000)
+       sk->ignread = 1;
 }
 
 static void huberr(struct socket *sk, int err, struct fnetnode *fn)
@@ -3195,7 +3228,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);
 }
@@ -3224,7 +3257,7 @@ static struct fnet dcnet =
 static void peerread(struct socket *sk, struct dcpeer *peer)
 {
     char *newbuf, *p;
-    size_t datalen;
+    size_t datalen, cnlen;
     struct command *cmd;
 
     if((newbuf = sockgetinbuf(sk, &datalen)) == NULL)
@@ -3239,22 +3272,29 @@ static void peerread(struct socket *sk, struct dcpeer *peer)
        while((peer->inbufdata > 0) && (p = memchr(peer->inbuf, '|', peer->inbufdata)) != NULL)
        {
            *(p++) = 0;
-           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)] == ' ') || (peer->inbuf[strlen(cmd->name)] == '|')))
+               cnlen = strlen(cmd->name);
+               if(!strncmp(peer->inbuf, cmd->name, cnlen) && ((peer->inbuf[cnlen] == ' ') || (peer->inbuf[cnlen] == 0)))
                    break;
            }
+           if((cmd->limit == 0) || (peer->queue.size < cmd->limit))
+               newqcmd(&peer->queue, peer->inbuf);
            memmove(peer->inbuf, p, peer->inbufdata -= p - peer->inbuf);
            if(cmd->stop)
            {
                peer->state = PEER_STOP;
                break;
+           } else {
+               if(peer->queue.size > 50)
+                   sk->ignread = 1;
            }
        }
     } 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)
@@ -3730,9 +3770,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;
@@ -3741,7 +3782,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 == '$')
            {
@@ -3752,13 +3793,18 @@ static int run(void)
            }
            freeqcmd(qcmd);
            ret = 1;
-           break;
+           quota--;
        }
+       if(hub->queue.size < 1000)
+           hub->sk->ignread = 0;
+       if(quota < 1)
+           break;
     }
+    quota = 20;
     for(peer = peers; peer != NULL; peer = nextpeer)
     {
        nextpeer = peer->next;
-       if((qcmd = ulqcmd(&peer->queue)) != NULL)
+       while((quota > 0) && ((qcmd = ulqcmd(&peer->queue)) != NULL))
        {
            if(peer->timeout != NULL)
                canceltimer(peer->timeout);
@@ -3767,8 +3813,12 @@ 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;
     }
     return(ret);
 }