X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod_command.c;h=29c330f36a526d1004cb8595248fb75008033438;hb=5967ac5353739c3ff571dd12d4c6814fa8493ad8;hp=cccc2a8908d933d0d5ef2f41bb6b79dc11602baf;hpb=6811b2f8ea8b7a8c77046285c9432aee6327da80;p=paraslash.git

diff --git a/audiod_command.c b/audiod_command.c
index cccc2a89..29c330f3 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file audiod_command.c Commands for para_audiod. */
 
@@ -17,6 +13,7 @@
 
 #include "audiod.lsg.h"
 #include "para.h"
+#include "lsu.h"
 #include "audiod_cmd.lsg.h"
 #include "list.h"
 #include "sched.h"
@@ -82,7 +79,7 @@ static INITIALIZED_LIST_HEAD(client_list);
 static int num_clients;
 
 /** The list of all status items used by para_{server,audiod,gui}. */
-const char *status_item_list[] = {STATUS_ITEM_ARRAY};
+const char *status_item_list[] = {STATUS_ITEMS};
 
 static void dump_stat_client_list(void)
 {
@@ -228,62 +225,56 @@ __malloc static char *audiod_status_string(void)
 	return para_strdup(status);
 }
 
-static int dump_commands(int fd)
+static int com_help(int fd, struct lls_parse_result *lpr)
 {
-	char *buf = para_strdup(""), *tmp = NULL;
-	int i;
-	ssize_t ret;
-	const struct lls_command *cmd;
+	char *buf;
+	int ret;
+	const struct lls_opt_result *r =
+		lls_opt_result(LSG_AUDIOD_CMD_HELP_OPT_LONG, lpr);
+	bool long_help = lls_opt_given(r);
 
-	for (i = 1; (cmd = lls_cmd(i, audiod_cmd_suite)); i++) {
-		tmp = make_message("%s%s\t%s\n", buf, lls_command_name(cmd),
-			lls_purpose(cmd));
-		free(buf);
-		buf = tmp;
-	}
+	lsu_com_help(long_help, lpr, audiod_cmd_suite, NULL, &buf, NULL);
 	ret = client_write(fd, buf);
 	free(buf);
-	return ret;
+	return ret < 0? ret : 0;
 }
+EXPORT_AUDIOD_CMD_HANDLER(help)
 
-static int com_help(int fd, struct lls_parse_result *lpr)
+static int com_ll(int fd, struct lls_parse_result *lpr)
 {
-	int ret;
-	char *buf, *errctx;
-	const struct lls_command *cmd;
+	unsigned ll;
+	char *errctx;
+	const char *sev[] = {SEVERITIES};
+	const char *arg;
+	int ret = lls(lls_check_arg_count(lpr, 0, 1, &errctx));
 
-	ret = lls(lls_check_arg_count(lpr, 0, 1, &errctx));
 	if (ret < 0) {
-		if (errctx) {
-			buf = make_message("%s\n", errctx);
-			client_write(fd, buf);
-			free(buf);
-			free(errctx);
-		}
+		char *tmp = make_message("%s\n", errctx);
+		free(errctx);
+		client_write(fd, tmp);
+		free(tmp);
 		return ret;
 	}
-	if (lls_num_inputs(lpr) == 0)
-		return dump_commands(fd);
-	ret = lls(lls_lookup_subcmd(lls_input(0, lpr), audiod_cmd_suite,
-		&errctx));
-	if (ret < 0) {
-		buf = make_message("%s: %s\nAvailable commands:\n", errctx?
-			errctx : lls_input(0, lpr), para_strerror(-ret));
-		if (client_write(fd, buf) >= 0)
-			dump_commands(fd);
-		free(errctx);
-		free(buf);
-		goto out;
+	if (lls_num_inputs(lpr) == 0) {
+		char *msg;
+		ll = daemon_get_loglevel();
+		msg = make_message("%s\n", sev[ll]);
+		ret = client_write(fd, msg);
+		free(msg);
+		return ret;
 	}
-	cmd = lls_cmd(ret, audiod_cmd_suite);
-	buf = lls_long_help(cmd);
-	assert(buf);
-	ret = client_write(fd, buf);
-	free(buf);
-out:
-	return ret < 0? ret : 0;
+	arg = lls_input(0, lpr);
+	for (ll = 0; ll < NUM_LOGLEVELS; ll++) {
+		if (!strcmp(arg, sev[ll]))
+			break;
+	}
+	if (ll >= NUM_LOGLEVELS)
+		return -ERRNO_TO_PARA_ERROR(EINVAL);
+	PARA_INFO_LOG("new log level: %s\n", sev[ll]);
+	daemon_set_loglevel(ll);
+	return 1;
 }
-EXPORT_AUDIOD_CMD_HANDLER(help)
+EXPORT_AUDIOD_CMD_HANDLER(ll)
 
 static int com_tasks(int fd, __a_unused struct lls_parse_result *lpr)
 {
@@ -405,10 +396,9 @@ EXPORT_AUDIOD_CMD_HANDLER(version)
  * Handle arriving connections on the local socket.
  *
  * \param accept_fd The fd to accept connections on.
- * \param rfds If \a accept_fd is not set in \a rfds, do nothing.
  *
- * This is called in each iteration of the select loop. If there is an incoming
- * connection on \a accept_fd, this function reads the command sent by the peer,
+ * This is called in each iteration of the main loop of the scheduler. If there
+ * is an incoming connection, the function reads the command sent by the peer,
  * checks the connecting user's permissions by using unix socket credentials
  * (if supported by the OS) and calls the corresponding command handler if
  * permissions are OK.
@@ -417,8 +407,8 @@ EXPORT_AUDIOD_CMD_HANDLER(version)
  * connection to accept.
  *
  * \sa \ref para_accept(), \ref recv_cred_buffer().
- * */
-int handle_connect(int accept_fd, fd_set *rfds)
+ */
+int dispatch_local_connection(int accept_fd)
 {
 	int argc, ret, clifd;
 	char buf[MAXLINE], **argv = NULL;
@@ -429,7 +419,7 @@ int handle_connect(int accept_fd, fd_set *rfds)
 	char *errctx = NULL;
 	const struct audiod_command_info *aci;
 
-	ret = para_accept(accept_fd, rfds, &unix_addr, sizeof(struct sockaddr_un), &clifd);
+	ret = para_accept(accept_fd, &unix_addr, sizeof(struct sockaddr_un), &clifd);
 	if (ret <= 0)
 		return ret;
 	ret = recv_cred_buffer(clifd, buf, sizeof(buf) - 1);
@@ -481,41 +471,41 @@ void audiod_status_dump(bool force)
 {
 	char *old, *new;
 
-	old = stat_item_values[SI_PLAY_TIME];
+	old = stat_item_values[SI_play_time];
 	new = get_time_string();
 	if (new) {
 		if (force || !old || strcmp(old, new)) {
 			free(old);
-			stat_item_values[SI_PLAY_TIME] = new;
-			stat_client_write_item(SI_PLAY_TIME);
+			stat_item_values[SI_play_time] = new;
+			stat_client_write_item(SI_play_time);
 		} else
 			free(new);
 	}
 
 	new = daemon_get_uptime_str(now);
-	old = stat_item_values[SI_AUDIOD_UPTIME];
+	old = stat_item_values[SI_audiod_uptime];
 	if (force || !old || strcmp(old, new)) {
 		free(old);
-		stat_item_values[SI_AUDIOD_UPTIME] = new;
-		stat_client_write_item(SI_AUDIOD_UPTIME);
+		stat_item_values[SI_audiod_uptime] = new;
+		stat_client_write_item(SI_audiod_uptime);
 	} else
 		free(new);
 
-	old = stat_item_values[SI_AUDIOD_STATUS];
+	old = stat_item_values[SI_audiod_status];
 	new = audiod_status_string();
 	if (force || !old || strcmp(old, new)) {
 		free(old);
-		stat_item_values[SI_AUDIOD_STATUS] = new;
-		stat_client_write_item(SI_AUDIOD_STATUS);
+		stat_item_values[SI_audiod_status] = new;
+		stat_client_write_item(SI_audiod_status);
 	} else
 		free(new);
 
-	old = stat_item_values[SI_DECODER_FLAGS];
+	old = stat_item_values[SI_decoder_flags];
 	new = audiod_get_decoder_flags();
 	if (force || !old || strcmp(old, new)) {
 		free(old);
-		stat_item_values[SI_DECODER_FLAGS] = new;
-		stat_client_write_item(SI_DECODER_FLAGS);
+		stat_item_values[SI_decoder_flags] = new;
+		stat_client_write_item(SI_decoder_flags);
 	} else
 		free(new);
 }