X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=3a39027523a72c686d997d1b358912dc5dfd2363;hp=d5c53bf90059101cd345254e0a3c294c3df73307;hb=c257c9c321c6e9494dbcbb6da0af675c3a2aa8e4;hpb=4d9d588c5df359c3c5f279fbfd4ea51d3a2afc87

diff --git a/audiod_command.c b/audiod_command.c
index d5c53bf9..3a390275 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2014 Andre Noll <maan@tuebingen.mpg.de>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -16,6 +16,7 @@
 
 #include "para.h"
 #include "audiod.cmdline.h"
+#include "audiod.command_list.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
@@ -30,11 +31,31 @@
 #include "write.h"
 #include "fd.h"
 #include "version.h"
-#include "audiod_command_list.h"
 
 extern struct sched sched;
 extern char *stat_item_values[NUM_STAT_ITEMS];
 
+typedef int audiod_command_handler_t(int, int, char **);
+static audiod_command_handler_t AUDIOD_COMMAND_HANDLERS;
+
+/* Defines one command of para_audiod. */
+struct audiod_command {
+	const char *name;
+	/* Pointer to the function that handles the command. */
+	/*
+	 * Command handlers must never never close their file descriptor. A
+	 * positive return value tells audiod that the status items have
+	 * changed. In this case audiod will send an updated version of all
+	 * status items to to each connected stat client.
+	 */
+	audiod_command_handler_t *handler;
+	/* One-line description. */
+	const char *description;
+	/* Summary of the command line options. */
+	const char *usage;
+	/* The long help text. */
+	const char *help;
+};
 
 static struct audiod_command audiod_cmds[] = {DEFINE_AUDIOD_CMD_ARRAY};
 
@@ -63,7 +84,7 @@ struct stat_client {
 	int fd;
 	/** Bitmask of those status items the client is interested in. */
 	uint64_t item_mask;
-	/** See \ref stat_client flags. s*/
+	/** See \ref stat_client flags. */
 	unsigned flags;
 	/** Its entry in the list of stat clients. */
 	struct list_head node;
@@ -98,15 +119,19 @@ static void dump_stat_client_list(void)
 static int stat_client_add(int fd, uint64_t mask, int parser_friendly)
 {
 	struct stat_client *new_client;
+	int ret;
 
 	if (num_clients >= MAX_STAT_CLIENTS) {
 		PARA_ERROR_LOG("maximal number of stat clients (%d) exceeded\n",
 			MAX_STAT_CLIENTS);
 		return -E_TOO_MANY_CLIENTS;
 	}
-	PARA_INFO_LOG("adding client on fd %d\n", fd);
-	new_client = para_calloc(sizeof(struct stat_client));
-	new_client->fd = fd;
+	ret = dup(fd);
+	if (ret < 0)
+		return -ERRNO_TO_PARA_ERROR(errno);
+	new_client = para_calloc(sizeof(*new_client));
+	new_client->fd = ret;
+	PARA_INFO_LOG("adding client on fd %d\n", new_client->fd);
 	new_client->item_mask = mask;
 	if (parser_friendly)
 		new_client->flags = SCF_PARSER_FRIENDLY;
@@ -164,8 +189,7 @@ void stat_client_write_item(int item_num)
 			continue;
 		b = (sc->flags & SCF_PARSER_FRIENDLY)? &pfpb : &pb;
 		if (!b->buf)
-			(void)WRITE_STATUS_ITEM(b, item_num, "%s\n",
-				msg? msg : "");
+			WRITE_STATUS_ITEM(b, item_num, "%s\n", msg? msg : "");
 		ret = write(sc->fd, b->buf, b->offset);
 		if (ret == b->offset)
 			continue;
@@ -216,46 +240,6 @@ __malloc static char *audiod_status_string(void)
 	return para_strdup(status);
 }
 
-static int get_play_time_slot_num(void)
-{
-	int i, oldest_slot = -1;
-	struct timeval oldest_wstime = {0, 0};
-
-	FOR_EACH_SLOT(i) {
-		struct slot_info *s = &slot[i];
-		struct timeval wstime;
-		if (!s->wns || !s->wns[0].btrn)
-			continue;
-		btr_get_node_start(s->wns[0].btrn, &wstime);
-		if (oldest_slot >= 0 && tv_diff(&wstime, &oldest_wstime, NULL) > 0)
-			continue;
-		oldest_wstime = wstime;
-		oldest_slot = i;
-	}
-	//PARA_CRIT_LOG("oldest slot: %d\n", oldest_slot);
-	return oldest_slot;
-}
-
-__malloc static char *decoder_flags(void)
-{
-	int i;
-	char flags[MAX_STREAM_SLOTS + 1];
-
-	FOR_EACH_SLOT(i) {
-		struct slot_info *s = &slot[i];
-		char flag = '0';
-		if (s->receiver_node)
-			flag += 1;
-		if (s->fns)
-			flag += 2;
-		if (s->wns)
-			flag += 4;
-		flags[i] = flag;
-	}
-	flags[MAX_STREAM_SLOTS] = '\0';
-	return para_strdup(flags);
-}
-
 static int dump_commands(int fd)
 {
 	char *buf = para_strdup(""), *tmp = NULL;
@@ -273,17 +257,10 @@ static int dump_commands(int fd)
 	return ret;
 }
 
-/*
- * command handlers don't close their fd on errors (ret < 0) so that
- * its caller can send an error message. Otherwise (ret >= 0) it's up
- * to each individual command to close the fd if necessary.
- */
-
 static int com_help(int fd, int argc, char **argv)
 {
 	int i, ret;
 	char *buf;
-	const char *dflt = "No such command. Available commands:\n";
 
 	if (argc < 2) {
 		ret = dump_commands(fd);
@@ -305,25 +282,22 @@ static int com_help(int fd, int argc, char **argv)
 		free(buf);
 		goto out;
 	}
-	ret = client_write(fd, dflt);
+	ret = client_write(fd, "No such command. Available commands:\n");
 	if (ret > 0)
 		ret = dump_commands(fd);
 out:
-	if (ret >= 0)
-		close(fd);
-	return ret;
+	return ret < 0? ret : 0;
 }
 
 static int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	char *tl = get_task_list(&sched);
 	int ret = 1;
+
 	if (tl)
 		ret = client_write(fd, tl);
 	free(tl);
-	if (ret > 0)
-		close(fd);
-	return ret;
+	return ret < 0? ret : 0;
 }
 
 static int com_stat(int fd, int argc, char **argv)
@@ -362,48 +336,45 @@ static int com_stat(int fd, int argc, char **argv)
 		char *item = stat_item_values[i];
 		if (!((one << i) & mask))
 			continue;
-		(void)WRITE_STATUS_ITEM(&b, i, "%s\n", item? item : "");
+		WRITE_STATUS_ITEM(&b, i, "%s\n", item? item : "");
 	}
 	ret = client_write(fd, b.buf);
 	if (ret >= 0)
 		ret = stat_client_add(fd, mask, parser_friendly);
 	free(b.buf);
-	return ret;
+	return ret < 0? ret : 0;
 }
 
 static int com_grab(int fd, int argc, char **argv)
 {
-	return grab_client_new(fd, argc, argv, &sched);
+	int ret = grab_client_new(fd, argc, argv, &sched);
+	return ret < 0? ret : 0;
 }
 
-__noreturn static int com_term(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_term(__a_unused int fd, __a_unused int argc, __a_unused char **argv)
 {
-	close(fd);
-	clean_exit(EXIT_SUCCESS, "terminating on user request");
+	return -E_AUDIOD_TERM;
 }
 
-static int com_on(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_on(__a_unused int fd, __a_unused int argc, __a_unused char **argv)
 {
 	audiod_status = AUDIOD_ON;
-	close(fd);
 	return 1;
 }
 
-static int com_off(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_off(__a_unused int fd, __a_unused int argc, __a_unused char **argv)
 {
 	audiod_status = AUDIOD_OFF;
-	close(fd);
 	return 1;
 }
 
-static int com_sb(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_sb(__a_unused int fd, __a_unused int argc, __a_unused char **argv)
 {
 	audiod_status = AUDIOD_STANDBY;
-	close(fd);
 	return 1;
 }
 
-static int com_cycle(int fd, int argc, char **argv)
+static int com_cycle(__a_unused int fd, int argc, char **argv)
 {
 	switch (audiod_status) {
 		case  AUDIOD_ON:
@@ -416,7 +387,6 @@ static int com_cycle(int fd, int argc, char **argv)
 			return com_off(fd, argc, argv);
 			break;
 	}
-	close(fd);
 	return 1;
 }
 
@@ -431,21 +401,7 @@ static int com_version(int fd, int argc, char **argv)
 		msg = make_message("%s\n", version_single_line("audiod"));
 	ret = client_write(fd, msg);
 	free(msg);
-	if (ret >= 0)
-		close(fd);
-	return ret;
-}
-
-static int check_perms(uid_t uid)
-{
-	int i;
-
-	if (!conf.user_allow_given)
-		return 1;
-	for (i = 0; i < conf.user_allow_given; i++)
-		if (uid == conf.user_allow_arg[i])
-			return 1;
-	return -E_UCRED_PERM;
+	return ret < 0? ret : 0;
 }
 
 /**
@@ -479,9 +435,9 @@ int handle_connect(int accept_fd, fd_set *rfds)
 	if (ret < 0)
 		goto out;
 	uid = ret;
-	PARA_INFO_LOG("connection from user %i, buf: %s\n",  ret, buf);
-	ret = check_perms(uid);
-	if (ret < 0)
+	PARA_INFO_LOG("connection from UID %d, buf: %s\n", ret, buf);
+	ret = -E_UCRED_PERM;
+	if (!uid_is_whitelisted(uid))
 		goto out;
 	ret = create_argv(buf, "\n", &argv);
 	if (ret <= 0)
@@ -497,12 +453,12 @@ int handle_connect(int accept_fd, fd_set *rfds)
 	ret = -E_INVALID_AUDIOD_CMD;
 out:
 	free_argv(argv);
-	if (clifd > 0 && ret < 0 && ret != -E_CLIENT_WRITE) {
+	if (ret < 0 && ret != -E_CLIENT_WRITE) {
 		char *tmp = make_message("%s\n", para_strerror(-ret));
 		client_write(clifd, tmp);
 		free(tmp);
-		close(clifd);
 	}
+	close(clifd);
 	return ret;
 }
 
@@ -513,11 +469,10 @@ out:
  */
 void audiod_status_dump(bool force)
 {
-	int slot_num = get_play_time_slot_num();
 	char *old, *new;
 
 	old = stat_item_values[SI_PLAY_TIME];
-	new = get_time_string(slot_num);
+	new = get_time_string();
 	if (new) {
 		if (force || !old || strcmp(old, new)) {
 			free(old);
@@ -546,7 +501,7 @@ void audiod_status_dump(bool force)
 		free(new);
 
 	old = stat_item_values[SI_DECODER_FLAGS];
-	new = decoder_flags();
+	new = audiod_get_decoder_flags();
 	if (force || !old || strcmp(old, new)) {
 		free(old);
 		stat_item_values[SI_DECODER_FLAGS] = new;