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

diff --git a/daemon/ui.c b/daemon/ui.c
index a2ec720..df421ec 100644
--- a/daemon/ui.c
+++ b/daemon/ui.c
@@ -168,6 +168,7 @@ 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)
 {
@@ -1251,7 +1252,7 @@ static void cmd_register(struct socket *sk, struct uidata *data, int argc, wchar
 	return;
     }
     for(d2 = actives; d2 != NULL; d2 = d2->next) {
-	if((d2 != data) && d2->regname && !wcscmp(d2->regname, argv[1])) {
+	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;
 	}
@@ -1277,12 +1278,12 @@ static void cmd_sendmsg(struct socket *sk, struct uidata *data, int argc, wchar_
     if(argv[1][0] == L'#') {
 	rcptid = wcstol(argv[1] + 1, NULL, 0);
 	for(rcpt = actives; rcpt != NULL; rcpt = rcpt->next) {
-	    if(rcpt->id == rcptid)
+	    if((rcpt->userinfo == data->userinfo) && (rcpt->id == rcptid))
 		break;
 	}
     } else {
 	for(rcpt = actives; rcpt != NULL; rcpt = rcpt->next) {
-	    if(rcpt->regname && !wcscmp(rcpt->regname, argv[1]))
+	    if((rcpt->userinfo == data->userinfo) && rcpt->regname && !wcscmp(rcpt->regname, argv[1]))
 		break;
 	}
     }
@@ -1304,6 +1305,11 @@ static void cmd_sendmsg(struct socket *sk, struct uidata *data, int argc, wchar_
     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
 
@@ -1342,6 +1348,7 @@ static struct command commands[] =
     {L"transstatus", cmd_transstatus},
     {L"register", cmd_register},
     {L"sendmsg", cmd_sendmsg},
+    {L"uptime", cmd_uptime},
     {NULL, NULL}
 };
 
@@ -2153,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)