Enable passing of args to fnetnodes.

[doldaconnect.git] / daemon / ui.c

diff --git a/daemon/ui.c b/daemon/ui.c
index 50f20cf..94241e7 100644 (file)
--- a/daemon/ui.c
+++ b/daemon/ui.c
@@ -123,6 +123,7 @@ struct uidata
        {
            int fnact:1;
            int fnchat:1;
+           int fnpeer:1;
            int tract:1;
            int trprog:1;
            int srch:1;
@@ -557,6 +558,7 @@ static void cmd_fnetconnect(struct socket *sk, struct uidata *data, int argc, wc
     char *buf;
     int err;
     struct fnetnode *fn;
+    struct wcspair *args;
     
     haveargs(3);
     havepriv(PERM_FNETCTL);
@@ -565,7 +567,10 @@ static void cmd_fnetconnect(struct socket *sk, struct uidata *data, int argc, wc
        sq(sk, 0, L"504", L"Could not convert data to locale charset", NULL);
        return;
     }
-    fn = fnetinitconnect(argv[1], buf);
+    args = NULL;
+    for(i = 3; i < argc - 1; i += 2)
+       newwcspair(argv[i], argv[i + 1], &args);
+    fn = fnetinitconnect(argv[1], buf, args);
     err = errno;
     free(buf);
     if(fn == NULL)
@@ -576,11 +581,6 @@ static void cmd_fnetconnect(struct socket *sk, struct uidata *data, int argc, wc
            sq(sk, 0, L"509", L"Could not parse the address", L"%%s", strerror(err), NULL);
        return;
     }
-    for(i = 3; i < argc - 1; i += 2)
-    {
-       if(!wcscmp(argv[i], L"nick"))
-           fnetsetnick(fn, argv[i + 1]);
-    }
     linkfnetnode(fn);
     fnetsetname(fn, argv[2]);
     putfnetnode(fn);
@@ -744,7 +744,7 @@ static void cmd_download(struct socket *sk, struct uidata *data, int argc, wchar
            {
                transfersethash(transfer, parsehash(argv[i + 1]));
            } else {
-               transferaddarg(transfer, argv[i], argv[i + 1]);
+               newwcspair(argv[i], argv[i + 1], &transfer->args);
            }
        }
     }
@@ -835,6 +835,8 @@ static void cmd_notify(struct socket *sk, struct uidata *data, int argc, wchar_t
            data->notify.b.fnchat = val;
        } else if(!wcscasecmp(argv[i], L"fn:act")) {
            data->notify.b.fnact = val;
+       } else if(!wcscasecmp(argv[i], L"fn:peer")) {
+           data->notify.b.fnpeer = val;
        } else if(!wcscasecmp(argv[i], L"trans:act")) {
            data->notify.b.tract = val;
        } else if(!wcscasecmp(argv[i], L"trans:prog")) {
@@ -1161,7 +1163,7 @@ static void cmd_filtercmd(struct socket *sk, struct uidata *data, int argc, wcha
 static void cmd_lstrarg(struct socket *sk, struct uidata *data, int argc, wchar_t **argv)
 {
     struct transfer *transfer;
-    struct transarg *ta;
+    struct wcspair *ta;
     
     haveargs(2);
     havepriv(PERM_TRANS);
@@ -1180,7 +1182,7 @@ static void cmd_lstrarg(struct socket *sk, struct uidata *data, int argc, wchar_
        sq(sk, 0, L"201", L"Transfer has no arguments", NULL);
     } else {
        for(ta = transfer->args; ta != NULL; ta = ta->next)
-           sq(sk, ta->next != NULL, L"200", L"%%ls", ta->rec, L"%%ls", ta->val, NULL);
+           sq(sk, ta->next != NULL, L"200", L"%%ls", ta->key, L"%%ls", ta->val, NULL);
     }
 }
 
@@ -1267,18 +1269,10 @@ static struct qcommand *unlinkqcmd(struct uidata *data)
     return(qcmd);
 }
 
-static struct notif *newnotif(struct uidata *data, int code, ...)
+static void notifappendv(struct notif *notif, va_list args)
 {
-    struct notif *notif;
-    va_list args;
     int dt, ca;
     
-    notif = smalloc(sizeof(*notif));
-    memset(notif, 0, sizeof(*notif));
-    notif->rlimit = 0.0;
-    notif->ui = data;
-    notif->code = code;
-    va_start(args, code);
     while((dt = va_arg(args, int)) != NOTIF_END)
     {
        ca = notif->argc;
@@ -1298,6 +1292,29 @@ static struct notif *newnotif(struct uidata *data, int code, ...)
            break;
        }
     }
+}
+
+static void notifappend(struct notif *notif, ...)
+{
+    va_list args;
+    
+    va_start(args, notif);
+    notifappendv(notif, args);
+    va_end(args);
+}
+
+static struct notif *newnotif(struct uidata *data, int code, ...)
+{
+    struct notif *notif;
+    va_list args;
+    
+    notif = smalloc(sizeof(*notif));
+    memset(notif, 0, sizeof(*notif));
+    notif->rlimit = 0.0;
+    notif->ui = data;
+    notif->code = code;
+    va_start(args, code);
+    notifappendv(notif, args);
     va_end(args);
     notif->next = NULL;
     notif->prev = data->lnotif;
@@ -1718,7 +1735,7 @@ static int fnactive(struct fnetnode *fn, wchar_t *attrib, void *uudata)
                if((notif = findnotif(data->fnotif, 1, NOTIF_PEND, 605, fn->id)) != NULL)
                    notif->argv[1].d.n = fn->numpeers;
                else
-                   newnotif(data, 605, NOTIF_ID, fn->id, NOTIF_INT, fn->numpeers, NOTIF_END);
+                   newnotif(data, 605, NOTIF_ID, fn->id, NOTIF_INT, fn->numpeers, NOTIF_END)->rlimit = 0.5;
            }
        }
     }
@@ -1737,6 +1754,66 @@ static int fnunlink(struct fnetnode *fn, void *uudata)
     return(0);
 }
 
+static int peernew(struct fnetnode *fn, struct fnetpeer *peer, void *uudata)
+{
+    struct uidata *data;
+    
+    for(data = actives; data != NULL; data = data->next)
+    {
+       if(data->notify.b.fnpeer)
+           newnotif(data, 630, NOTIF_INT, fn->id, NOTIF_STR, peer->id, NOTIF_STR, peer->nick, NOTIF_END);
+    }
+    return(0);
+}
+
+static int peerdel(struct fnetnode *fn, struct fnetpeer *peer, void *uudata)
+{
+    struct uidata *data;
+    
+    for(data = actives; data != NULL; data = data->next)
+    {
+       if(data->notify.b.fnpeer)
+           newnotif(data, 631, NOTIF_INT, fn->id, NOTIF_STR, peer->id, NOTIF_END);
+    }
+    return(0);
+}
+
+static int peerchange(struct fnetnode *fn, struct fnetpeer *peer, struct fnetpeerdi *di, void *uudata)
+{
+    struct uidata *data;
+    struct notif *notif;
+    wchar_t buf[32];
+    
+    for(data = actives; data != NULL; data = data->next)
+    {
+       if(data->notify.b.fnpeer)
+       {
+           for(notif = data->fnotif; notif != NULL; notif = notif->next)
+           {
+               if((notif->code == 632) && (notif->state == NOTIF_PEND) && (notif->argv[0].d.n == fn->id) && !wcscmp(notif->argv[1].d.s, peer->id))
+                   break;
+           }
+           if(notif == NULL)
+               notif = newnotif(data, 632, NOTIF_INT, fn->id, NOTIF_STR, peer->id, NOTIF_STR, peer->nick, NOTIF_END);
+           notifappend(notif, NOTIF_STR, di->datum->id, NOTIF_INT, di->datum->datatype, NOTIF_END);
+           switch(di->datum->datatype)
+           {
+           case FNPD_INT:
+               notifappend(notif, NOTIF_INT, di->data.num, NOTIF_END);
+               break;
+           case FNPD_STR:
+               notifappend(notif, NOTIF_STR, di->data.str, NOTIF_END);
+               break;
+           case FNPD_LL:
+               swprintf(buf, sizeof(buf) / sizeof(*buf), L"%lli", di->data.lnum);
+               notifappend(notif, NOTIF_STR, buf, NOTIF_END);
+               break;
+           }
+       }
+    }
+    return(0);
+}
+
 static int newfnetnode(struct fnetnode *fn, void *uudata)
 {
     struct uidata *data;
@@ -1749,6 +1826,9 @@ static int newfnetnode(struct fnetnode *fn, void *uudata)
     CBREG(fn, fnetnode_ac, fnactive, NULL, NULL);
     CBREG(fn, fnetnode_chat, recvchat, NULL, NULL);
     CBREG(fn, fnetnode_unlink, fnunlink, NULL, NULL);
+    CBREG(fn, fnetpeer_new, peernew, NULL, NULL);
+    CBREG(fn, fnetpeer_del, peerdel, NULL, NULL);
+    CBREG(fn, fnetpeer_chdi, peerchange, NULL, NULL);
     return(0);
 }
 
@@ -1791,7 +1871,7 @@ static int transferchattr(struct transfer *transfer, wchar_t *attrib, void *uuda
        for(data = actives; data != NULL; data = data->next)
        {
            if(haspriv(data, PERM_TRANS) && data->notify.b.tract && ((transfer->owner == 0) || (transfer->owner == data->uid)))
-               newnotif(data, 617, NOTIF_ID, transfer->id, NOTIF_STR, (transfer->hash == NULL)?L"":unparsehash(transfer->hash), NOTIF_END);
+               newnotif(data, 618, NOTIF_ID, transfer->id, NOTIF_STR, (transfer->hash == NULL)?L"":unparsehash(transfer->hash), NOTIF_END);
        }
     }
     return(0);