X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fui.c;h=51528086dc6ec6d18bfe6558cf2f3645e2291722;hb=175c86de77cd5e6d447cfba50dc8f755db87eb16;hp=066615dbdb054ce5c449d46bd563db863ffb879e;hpb=76236762f2bd653a4283e1476388f7374464cc20;p=doldaconnect.git diff --git a/daemon/ui.c b/daemon/ui.c index 066615d..5152808 100644 --- a/daemon/ui.c +++ b/daemon/ui.c @@ -128,11 +128,14 @@ struct uidata int tract:1; int trprog:1; int srch:1; + int msg:1; } b; int w; } notify; wchar_t *username; struct uiuser *userinfo; + int id; + wchar_t *regname; uid_t uid; struct notif *fnotif, *lnotif; char *fcmdbuf; @@ -159,10 +162,13 @@ struct uidata static int srcheta(struct search *srch, void *uudata); static int srchcommit(struct search *srch, void *uudata); static int srchres(struct search *srch, struct srchres *sr, void *uudata); +static struct notif *newnotif(struct uidata *data, int code, ...); +static void notifappend(struct notif *notif, ...); struct uiuser *users = NULL; struct uidata *actives = NULL; struct socket *uisocket = NULL; +static time_t starttime; static wchar_t *quoteword(wchar_t *word) { @@ -584,7 +590,7 @@ static void cmd_fnetconnect(struct socket *sk, struct uidata *data, int argc, wc args = NULL; for(i = 3; i < argc - 1; i += 2) newwcspair(argv[i], argv[i + 1], &args); - fn = fnetinitconnect(argv[1], buf, args); + fn = fnetinitconnect(argv[1], data->userinfo->name, buf, args); err = errno; free(buf); if(fn == NULL) @@ -635,6 +641,11 @@ static void cmd_disconnect(struct socket *sk, struct uidata *data, int argc, wch sq(sk, 0, L"510", L"No such node", NULL); return; } + if(wpfind(fn->args, L"locked") && !((data->userinfo->perms & PERM_ADMIN) || !wcscmp(data->userinfo->name, fn->owner))) + { + sq(sk, 0, L"502", L"This node is locked and you are neither administrator nor its owner", NULL); + return; + } killfnetnode(fn); unlinkfnetnode(fn); } @@ -680,7 +691,7 @@ static void cmd_lspeers(struct socket *sk, struct uidata *data, int argc, wchar_ } else { for(peer = fn->peers; peer != NULL; peer = peer->next) { - sq(sk, 2 | ((peer->next != NULL)?1:0), L"200", peer->id, peer->nick, NULL); + sq(sk, 2 | ((peer->next != NULL)?1:0), L"200", L"%%s", peer->id, L"%%s", peer->nick, NULL); for(i = 0; i < peer->dinum; i++) { if(peer->peerdi[i].datum->datatype == FNPD_INT) @@ -693,7 +704,7 @@ static void cmd_lspeers(struct socket *sk, struct uidata *data, int argc, wchar_ sq(sk, 2, peer->peerdi[i].datum->id, buf, NULL); } if((peer->peerdi[i].datum->datatype == FNPD_STR) && (peer->peerdi[i].data.str != NULL)) - sq(sk, 2, peer->peerdi[i].datum->id, peer->peerdi[i].data.str, NULL); + sq(sk, 2, peer->peerdi[i].datum->id, L"%%s", peer->peerdi[i].data.str, NULL); } sq(sk, 0, NULL); } @@ -857,6 +868,8 @@ static void cmd_notify(struct socket *sk, struct uidata *data, int argc, wchar_t data->notify.b.trprog = val; } else if(!wcscasecmp(argv[i], L"srch:act")) { data->notify.b.srch = val; + } else if(!wcscasecmp(argv[i], L"msg")) { + data->notify.b.msg = val; } } sq(sk, 0, L"200", L"Notification alteration succeeded", NULL); @@ -1124,7 +1137,7 @@ static void cmd_filtercmd(struct socket *sk, struct uidata *data, int argc, wcha sq(sk, 0, L"505", L"System error - Could not fork session", "Internal error", NULL); return; } - if((filtercmd = findfile(icswcstombs(confgetstr("ui", "filtercmd"), NULL, NULL), "dcdl-filtercmd", pwent->pw_dir)) == NULL) + if((filtercmd = findfile(icswcstombs(confgetstr("ui", "filtercmd"), NULL, NULL), "dcdl-filtercmd", pwent->pw_dir, 0)) == NULL) { flog(LOG_WARNING, "could not find filtercmd executable for user %s", pwent->pw_name); sq(sk, 0, L"505", L"System error - Could not fork session", L"Could not find filtercmd executable", NULL); @@ -1230,6 +1243,78 @@ static void cmd_transstatus(struct socket *sk, struct uidata *data, int argc, wc free(buf2); } +static void cmd_register(struct socket *sk, struct uidata *data, int argc, wchar_t **argv) +{ + struct uidata *d2; + + haveargs(2); + if(data->userinfo == NULL) { + sq(sk, 0, L"502", L"Must be logged in", NULL); + return; + } + if(argv[1][0] == L'#') { + sq(sk, 0, L"509", L"Name must not begin with a hash sign", NULL); + return; + } + for(d2 = actives; d2 != NULL; d2 = d2->next) { + if((d2 != data) && (d2->userinfo == data->userinfo) && d2->regname && !wcscmp(d2->regname, argv[1])) { + sq(sk, 0, L"516", L"Name already in use", NULL); + return; + } + } + if(data->regname != NULL) + free(data->regname); + data->regname = swcsdup(argv[1]); + sq(sk, 0, L"200", L"Registered", NULL); +} + +static void cmd_sendmsg(struct socket *sk, struct uidata *data, int argc, wchar_t **argv) +{ + int i, rcptid; + struct uidata *rcpt; + wchar_t *myname; + struct notif *notif; + + haveargs(2); + if(data->userinfo == NULL) { + sq(sk, 0, L"502", L"Must be logged in", NULL); + return; + } + if(argv[1][0] == L'#') { + rcptid = wcstol(argv[1] + 1, NULL, 0); + for(rcpt = actives; rcpt != NULL; rcpt = rcpt->next) { + if((rcpt->userinfo == data->userinfo) && (rcpt->id == rcptid)) + break; + } + } else { + for(rcpt = actives; rcpt != NULL; rcpt = rcpt->next) { + if((rcpt->userinfo == data->userinfo) && rcpt->regname && !wcscmp(rcpt->regname, argv[1])) + break; + } + } + if(rcpt == NULL) { + sq(sk, 0, L"517", L"No such recipient", NULL); + return; + } + if(!rcpt->notify.b.msg) { + sq(sk, 0, L"518", L"Recipient not listening for messages", NULL); + return; + } + if(data->regname != NULL) + myname = swcsdup(data->regname); + else + myname = swprintf2(L"#%i", data->id); + notif = newnotif(rcpt, 640, NOTIF_STR, myname, NOTIF_END); + for(i = 2; i < argc; i++) + notifappend(notif, NOTIF_STR, argv[i], NOTIF_END); + sq(sk, 0, L"200", L"Message sent", NULL); +} + +static void cmd_uptime(struct socket *sk, struct uidata *data, int argc, wchar_t **argv) +{ + sq(sk, 0, L"200", L"%%i", time(NULL) - starttime, NULL); +} + #undef haveargs #undef havepriv @@ -1266,6 +1351,9 @@ static struct command commands[] = {L"lstrarg", cmd_lstrarg}, {L"hashstatus", cmd_hashstatus}, {L"transstatus", cmd_transstatus}, + {L"register", cmd_register}, + {L"sendmsg", cmd_sendmsg}, + {L"uptime", cmd_uptime}, {NULL, NULL} }; @@ -1441,6 +1529,8 @@ static void freeuidata(struct uidata *data) } if(data->auth != NULL) authputhandle(data->auth); + if(data->regname != NULL) + free(data->regname); if(data->username != NULL) { if(data->userinfo != NULL) @@ -1478,9 +1568,11 @@ static void queuecmd(struct uidata *data, struct command *cmd, int argc, wchar_t static struct uidata *newuidata(struct socket *sk) { struct uidata *data; + static int curid = 0; data = smalloc(sizeof(*data)); memset(data, 0, sizeof(*data)); + data->id = curid++; data->sk = sk; getsock(sk); data->inbuf = smalloc(1024); @@ -2073,6 +2165,7 @@ static int init(int hup) } if(!hup) { + starttime = time(NULL); if(uisocket != NULL) putsock(uisocket); if((uisocket = netcstcplisten(confgetint("ui", "port"), 1, uiaccept, NULL)) == NULL)