X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fui.c;h=df421eca317014f902f885e292f9cee4f10dde0e;hb=6e37d33d4f42ad119cafa516746b10adaa148e49;hp=2daf6881e4fb79874c77fe0b223ed24ff03d488d;hpb=edda83f20cb7ca8ad5d1076d6a7cebe067a3fb23;p=doldaconnect.git

diff --git a/daemon/ui.c b/daemon/ui.c
index 2daf688..df421ec 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;
@@ -144,7 +147,7 @@ struct uidata
     size_t inbufsize, indata;
     /* Wordset storage */
     wchar_t **argv;
-    int argc, args;
+    size_t argc, args;
     /* WCS conversation stuff */
     wchar_t *cb; /* Conversation buffer */
     size_t cbsize, cbdata;
@@ -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)
 {
@@ -857,6 +863,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 +1132,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 +1238,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 +1346,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 +1524,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 +1563,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 +2160,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)