X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fui.c;h=ea10427f6d9e4d723a563a7a462c9fb0a90e5c64;hb=d9f89ef5daa6375fc4ff257826fa39562fbe3ac3;hp=8a56c1f281d204218db081be23d1827139b2e6ff;hpb=7b2663a4c07e756aa44cb0e2144cb8efee1fe00c;p=doldaconnect.git

diff --git a/daemon/ui.c b/daemon/ui.c
index 8a56c1f..ea10427 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)
 {
@@ -589,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)
@@ -640,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);
     }
@@ -685,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"%%ls", peer->id, L"%%ls", peer->nick, NULL);
 	    for(i = 0; i < peer->dinum; i++)
 	    {
 		if(peer->peerdi[i].datum->datatype == FNPD_INT)
@@ -698,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"%%ls", peer->peerdi[i].data.str, NULL);
 	    }
 	    sq(sk, 0, NULL);
 	}
@@ -1232,7 +1238,7 @@ static void cmd_transstatus(struct socket *sk, struct uidata *data, int argc, wc
     havepriv(PERM_TRANS);
     buf1 = swprintf2(L"%lli", bytesdownload);
     buf2 = swprintf2(L"%lli", bytesupload);
-    sq(sk, 0, L"200", L"%%ls", buf1, L"%%ls", buf2, NULL);
+    sq(sk, 0, L"200", L"down", L"%%ls", buf1, L"up", L"%%ls", buf2, NULL);
     free(buf1);
     free(buf2);
 }
@@ -1304,6 +1310,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 +1353,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 +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)
@@ -2247,9 +2260,18 @@ static void terminate(void)
 
 static struct configvar myvars[] =
 {
+    /** If true, UI connections will only be accepted from localhost
+     * addresses (127.0.0.1, ::1 or ::ffff:127.0.0.1). Unless you are
+     * completely sure that you know what you are doing, never turn
+     * this off when auth.authless is on. */
     {CONF_VAR_BOOL, "onlylocal", {.num = 1}},
+    /** The port number on which to accept UI client connections. */
     {CONF_VAR_INT, "port", {.num = 1500}},
+    /** The TOS value to use for UI connections (see the TOS VALUES
+     * section). */
     {CONF_VAR_INT, "uitos", {.num = SOCK_TOS_MINDELAY}},
+    /** The name of the filtercmd script (see the FILES section for
+     * lookup information). */
     {CONF_VAR_STRING, "filtercmd", {.str = L"dc-filtercmd"}},
     {CONF_VAR_END}
 };