X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=bb916713254d96829a953a84121b0a3daeb992ba;hp=4d7afd2f2b37d2a4b67ec9d5d738839b13522153;hb=c36f5e92c572c8eaf77c227bce164b9e98a74a3e;hpb=f03ec9e1fdbd0a2f01f5b46fb7dbb6d2f72b7f38

diff --git a/audiod_command.c b/audiod_command.c
index 4d7afd2f..bb916713 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,280 +1,227 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <noll@mathematik.tu-darmstadt.de>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file audiod_command.c commands for para_audiod */
 
-#include "para.h"
+#include <regex.h>
+#include <sys/types.h>
+#include <dirent.h>
 
+#include "para.h"
 #include "audiod.cmdline.h"
 #include "list.h"
-#include "close_on_fork.h"
 #include "sched.h"
+#include "ggo.h"
 #include "filter.h"
-#include "grab_client.cmdline.h"
 #include "grab_client.h"
-
 #include "error.h"
 #include "audiod.h"
 #include "net.h"
 #include "daemon.h"
 #include "string.h"
 #include "fd.h"
+#include "audiod_command_list.h"
 
-/** defines one command of para_audiod */
-struct audiod_command {
-	/** the name of the command */
-	const char *name;
-	/** pointer to the function that handles the command */
-	int (*handler)(int, int, char**);
-	/**
-	 * if the command prefers to handle the full line (rather than the usual
-	 * argv[] array), it stores a pointer to the corresponding line handling
-	 * function here. In this case, the above \a handler pointer must be NULL.
-	 */
-	int (*line_handler)(int, char*);
-	/** one-line description of the command */
-	const char *description;
-	/** summary of the command line options */
-	const char *synopsis;
-	/** the long help text */
-	const char *help;
-};
-static int com_grab(int, char *);
-static int com_cycle(int, int, char **);
-static int com_help(int, int, char **);
-static int com_kill(int, int, char **);
-static int com_off(int, int, char **);
-static int com_on(int, int, char **);
-static int com_sb(int, int, char **);
-static int com_stat(int, int, char **);
-static int com_tasks(int, int, char **);
-static int com_term(int, int, char **);
-static struct audiod_command cmds[] = {
-{
-.name = "cycle",
-.handler = com_cycle,
-.description = "switch to next mode",
-.synopsis = "cycle",
-.help =
+extern char *stat_item_values[NUM_STAT_ITEMS];
 
-"on -> standby -> off -> on\n"
+/** Iterate over the array of all audiod commands. */
+#define FOR_EACH_COMMAND(c) for (c = 0; audiod_cmds[c].name; c++)
 
-},
-{
-.name = "grab",
-.line_handler = com_grab,
-.description = "grab the audio stream",
-.synopsis = "-- grab [grab_options]",
-.help =
-
-"grab ('splice') the audio stream at any position in the filter      \n"
-"chain and send that data back to the client. Try\n"
-"\t para_audioc -- grab -h\n"
-"for the list of available options.\n"
-},
+/** The maximal number of simultaneous connections. */
+#define MAX_STAT_CLIENTS 50
 
-{
-.name = "help",
-.handler = com_help,
-.description = "display command list or help for given command",
-.synopsis = "help [command]",
-.help =
-
-"When I was younger, so much younger than today, I never needed\n"
-"anybody's help in any way. But now these days are gone, I'm not so\n"
-"self assured. Now I find I've changed my mind and opened up the doors.\n"
-"\n"
-"				-- Beatles: Help\n"
-
-},
-{
-.name = "kill",
-.handler = com_kill,
-.description = "kill an active audiod task",
-.synopsis = "kill task_id [task_id ...]",
-.help =
-
-"call sched_unregister() and the event_handler of the given task(s)\n"
-
-},
-{
-.name = "off",
-.handler = com_off,
-.description = "deactivate para_audiod",
-.synopsis = "off",
-.help =
+/** Flags used for the stat command of para_audiod. */
+enum stat_client_flags {
+	/** Enable parser-friendly output. */
+	SCF_PARSER_FRIENDLY = 1,
+};
 
-"Close connection to para_server and stop all decoders.\n"
+/**
+ * Describes a status client of para_audiod.
+ *
+ * There's one such structure per audiod client that sent the 'stat' command.
+ *
+ * A status client is identified by its file descriptor.  para_audiod
+ * keeps a list of connected status clients.
+ */
+struct stat_client {
+	/** The stat client's file descriptor. */
+	int fd;
+	/** Bitmask of those status items the client is interested in. */
+	uint64_t item_mask;
+	/** See \ref stat_client flags. s*/
+	unsigned flags;
+	/** Its entry in the list of stat clients. */
+	struct list_head node;
+};
 
-},
-{
-.name = "on",
-.handler = com_on,
-.description = "activate para_audiod",
-.synopsis = "on",
-.help =
+static INITIALIZED_LIST_HEAD(client_list);
+static int num_clients;
 
-"Establish connection to para_server, retrieve para_server's current\n"
-"status. If playing, start corresponding decoder. Otherwise stop\n"
-"all decoders.\n"
+/** The list of all status items used by para_{server,audiod,gui}. */
+const char *status_item_list[] = {STATUS_ITEM_ARRAY};
 
-},
+static void dump_stat_client_list(void)
 {
-.name = "sb",
-.handler = com_sb,
-.description = "enter standby mode",
-.synopsis = "sb",
-.help =
+	struct stat_client *sc;
 
-"Stop all decoders but leave connection to para_server open.\n"
-
-},
+	list_for_each_entry(sc, &client_list, node)
+		PARA_INFO_LOG("stat client on fd %d\n", sc->fd);
+}
+/**
+ * Add a status client to the list.
+ *
+ * \param fd The file descriptor of the client.
+ * \param mask Bitfield of status items for this client.
+ * \param parser_friendly Enable parser-friendly output mode.
+ *
+ * Only those status items having the bit set in \a mask will be
+ * sent to the client.
+ *
+ * \return Positive value on success, or -E_TOO_MANY_CLIENTS if
+ * the number of connected clients exceeds #MAX_STAT_CLIENTS.
+ */
+static int stat_client_add(int fd, uint64_t mask, int parser_friendly)
 {
-.name = "stat",
-.handler = com_stat,
-.description = "print status information",
-.synopsis = "stat [item1 ...]",
-.help =
+	struct stat_client *new_client;
 
-"Dump given status items (all if none given) to stdout.\n"
-
-},
+	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;
+	new_client->item_mask = mask;
+	if (parser_friendly)
+		new_client->flags = SCF_PARSER_FRIENDLY;
+	para_list_add(&new_client->node, &client_list);
+	dump_stat_client_list();
+	num_clients++;
+	return 1;
+}
+/**
+ * Write a message to all connected status clients.
+ *
+ * \param item_num The number of the status item of \a msg.
+ *
+ * On write errors, remove the status client from the client list and close its
+ * file descriptor.
+ */
+void stat_client_write_item(int item_num)
 {
-.name = "tasks",
-.handler = com_tasks,
-.description = "list current tasks",
-.synopsis = "tasks",
-.help =
+	struct stat_client *sc, *tmp;
+	struct para_buffer pb = {.flags = 0};
+	struct para_buffer pfpb = {.flags = PBF_SIZE_PREFIX};
+	const uint64_t one = 1;
 
-"print the list of task ids together with the status of each task\n"
-
-},
-{
-.name = "term",
-.handler = com_term,
-.description = "terminate audiod",
-.synopsis = "term",
-.help =
+	list_for_each_entry_safe(sc, tmp, &client_list, node) {
+		int fd = sc->fd, ret;
 
-"Stop all decoders, shut down connection to para_server and exit.\n"
+		if (!((one << item_num) & sc->item_mask))
+			continue;
+		if (write_ok(fd) > 0) {
+			struct para_buffer *b =
+				(sc->flags & SCF_PARSER_FRIENDLY)? &pfpb : &pb;
+			char *msg = stat_item_values[item_num];
+			if (!b->buf)
+				WRITE_STATUS_ITEM(b, item_num, "%s\n",
+					msg? msg : "");
+			ret = write(fd, b->buf, b->offset);
+			if (ret == b->offset)
+				continue;
+		}
+		/* write error or fd not ready for writing */
+		close(fd);
+		num_clients--;
+		PARA_INFO_LOG("deleting client on fd %d\n", fd);
+		list_del(&sc->node);
+		free(sc);
+		dump_stat_client_list();
+	}
+	free(pb.buf);
+	free(pfpb.buf);
+//	if (num_clients)
+//		PARA_DEBUG_LOG("%d client(s)\n", num_clients);
+}
 
-},
+/**
+ * Check if string is a known status item.
+ *
+ * \param item Buffer containing the text to check.
+ *
+ * \return If \a item is a valid status item, the number of that status item is
+ * returned. Otherwise, this function returns \p -E_UNKNOWN_STAT_ITEM.
+ */
+static int stat_item_valid(const char *item)
 {
-.name = NULL,
+	int i;
+	if (!item || !*item) {
+		PARA_ERROR_LOG("%s\n", "no item");
+		return -E_UNKNOWN_STAT_ITEM;
+	}
+	FOR_EACH_STATUS_ITEM(i)
+		if (!strcmp(status_item_list[i], item))
+			return i;
+	PARA_ERROR_LOG("invalid stat item: %s\n", item);
+	return -E_UNKNOWN_STAT_ITEM;
 }
-};
-
-/** iterate over the array of all audiod commands */
-#define FOR_EACH_COMMAND(c) for (c = 0; cmds[c].name; c++)
 
 static int client_write(int fd, const char *buf)
 {
-	size_t len = strlen(buf);
-	return write(fd, buf, len) != len? -E_CLIENT_WRITE: 1;
-}
+	size_t len;
 
-static char *get_time_string(struct timeval *newest_stime)
-{
-	struct timeval diff, adj_stream_start, tmp;
-	int total = 0, use_server_time = 1,
-		length_seconds = stat_task->length_seconds;
-
-	if (!stat_task->playing) {
-		if (length_seconds)
-			return NULL;
-		return make_message("%s:\n", status_item_list[SI_PLAY_TIME]);
-	}
-	if (audiod_status == AUDIOD_OFF)
-		goto out;
-	if (stat_task->sa_time_diff_sign > 0)
-		tv_diff(&stat_task->server_stream_start, &stat_task->sa_time_diff,
-			&adj_stream_start);
-	else
-		tv_add(&stat_task->server_stream_start, &stat_task->sa_time_diff,
-			&adj_stream_start);
-	tmp = adj_stream_start;
-	if (newest_stime && audiod_status == AUDIOD_ON) {
-		tv_diff(newest_stime, &adj_stream_start, &diff);
-		if (tv2ms(&diff) < 5000) {
-			tmp = *newest_stime;
-			use_server_time = 0;
-		}
-	}
-	tv_diff(now, &tmp, &diff);
-	total = diff.tv_sec + stat_task->offset_seconds;
-	if (total > length_seconds)
-		total = length_seconds;
-	if (total < 0)
-		total = 0;
-out:
-	return make_message(
-		"%s:%s%d:%02d [%d:%02d] (%d%%/%d:%02d)\n",
-		status_item_list[SI_PLAY_TIME],
-		use_server_time? "~" : "",
-		total / 60,
-		total % 60,
-		(length_seconds - total) / 60,
-		(length_seconds - total) % 60,
-		length_seconds? (total * 100 + length_seconds / 2) /
-			length_seconds : 0,
-		length_seconds / 60,
-		length_seconds % 60
-	);
+	if (!buf)
+		return 0;
+	len = strlen(buf);
+	return write(fd, buf, len) != len? -E_CLIENT_WRITE: 1;
 }
 
 __malloc static char *audiod_status_string(void)
 {
 	const char *status = (audiod_status == AUDIOD_ON)?
 		"on" : (audiod_status == AUDIOD_OFF)? "off": "sb";
-	return make_message("%s:%s\n", status_item_list[SI_AUDIOD_STATUS], status);
+	return para_strdup(status);
 }
 
-static struct timeval *wstime(void)
+static int get_play_time_slot_num(void)
 {
-	int i;
-	struct timeval *max = NULL;
+	int i, oldest = -1;
+
 	FOR_EACH_SLOT(i) {
 		struct slot_info *s = &slot[i];
 		if (!s->wng)
 			continue;
-		if (max && tv_diff(&s->wstime, max, NULL) <= 0)
+		if (oldest >= 0 && tv_diff(&s->wstime, &slot[oldest].wstime,
+				NULL) > 0)
 			continue;
-		max = &s->wstime;
+		oldest = i;
 	}
-	return max;
+	return oldest;
 }
+
 __malloc static char *decoder_flags(void)
 {
 	int i;
-	char decoder_flags[MAX_STREAM_SLOTS + 1];
+	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->wng)
+		if (s->fc)
 			flag += 2;
-		decoder_flags[i] = flag;
+		if (s->wng)
+			flag += 4;
+		flags[i] = flag;
 	}
-	decoder_flags[MAX_STREAM_SLOTS] = '\0';
-	return make_message("%s:%s\n", status_item_list[SI_DECODER_FLAGS],
-		decoder_flags);
+	flags[MAX_STREAM_SLOTS] = '\0';
+	return para_strdup(flags);
 }
 
 static int dump_commands(int fd)
@@ -284,8 +231,8 @@ static int dump_commands(int fd)
 	ssize_t ret;
 
 	FOR_EACH_COMMAND(i) {
-		tmp = make_message("%s%s\t%s\n", buf, cmds[i].name,
-			cmds[i].description);
+		tmp = make_message("%s%s\t%s\n", buf, audiod_cmds[i].name,
+			audiod_cmds[i].description);
 		free(buf);
 		buf = tmp;
 	}
@@ -300,7 +247,7 @@ static int dump_commands(int fd)
  * to each individual command to close the fd if necessary.
  */
 
-static int com_help(int fd, int argc, char **argv)
+int com_help(int fd, int argc, char **argv)
 {
 	int i, ret;
 	char *buf;
@@ -311,16 +258,16 @@ static int com_help(int fd, int argc, char **argv)
 		goto out;
 	}
 	FOR_EACH_COMMAND(i) {
-		if (strcmp(cmds[i].name, argv[1]))
+		if (strcmp(audiod_cmds[i].name, argv[1]))
 			continue;
 		buf = make_message(
 			"NAME\n\t%s -- %s\n"
 			"SYNOPSIS\n\tpara_audioc %s\n"
 			"DESCRIPTION\n%s\n",
 			argv[1],
-			cmds[i].description,
-			cmds[i].synopsis,
-			cmds[i].help
+			audiod_cmds[i].description,
+			audiod_cmds[i].usage,
+			audiod_cmds[i].help
 		);
 		ret = client_write(fd, buf);
 		free(buf);
@@ -335,7 +282,7 @@ out:
 	return ret;
 }
 
-static int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
+int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	char *tl = get_task_list();
 	int ret = 1;
@@ -347,7 +294,7 @@ static int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
 	return ret;
 }
 
-static int com_kill(int fd, int argc, char **argv)
+int com_kill(int fd, int argc, char **argv)
 {
 	int i, ret = 1;
 	if (argc < 2)
@@ -362,165 +309,82 @@ static int com_kill(int fd, int argc, char **argv)
 	return ret;
 }
 
-static int com_stat(int fd, __a_unused int argc, __a_unused char **argv)
+int com_stat(int fd, int argc, char **argv)
 {
-	int i, ret;
-	char *buf = NULL;
-	long unsigned mask = ~0LU;
-
-	if (argc > 1) {
-		mask = 0;
-		for (i = 1; i < argc; i++) {
-			ret = stat_item_valid(argv[i]);
-			if (ret < 0)
-				return ret;
-			mask |= (1 << ret);
+	int i, ret, parser_friendly = 0;
+	uint64_t mask = 0;
+	const uint64_t one = 1;
+	struct para_buffer b = {.flags = 0};
+
+	for (i = 1; i < argc; i++) {
+		const char *arg = argv[i];
+		if (arg[0] != '-')
+			break;
+		if (!strcmp(arg, "--")) {
+			i++;
+			break;
 		}
-	}
-	PARA_INFO_LOG("mask: 0x%lx\n", mask);
-	if (mask & (1 << SI_PLAY_TIME)) {
-		struct timeval *t = wstime();
-		char *ts = get_time_string(t);
-		if (ts) {
-			ret = client_write(fd, ts);
-			if (ret < 0)
-				goto out;
-			free(ts);
+		if (!strncmp(arg, "-p", 2)) {
+			parser_friendly = 1;
+			b.flags = PBF_SIZE_PREFIX;
+			continue;
 		}
 	}
-	if (mask & (1 << SI_AUDIOD_UPTIME)) {
-		char *tmp, *us = uptime_str();
-		tmp = make_message("%s:%s\n",
-			status_item_list[SI_AUDIOD_UPTIME], us);
-		free(us);
-		ret = client_write(fd, tmp);
+	if (i >= argc)
+		mask--; /* set all bits */
+	for (; i < argc; i++) {
+		ret = stat_item_valid(argv[i]);
 		if (ret < 0)
-			goto out;
-		free(tmp);
+			return ret;
+		mask |= (one << ret);
 	}
-	if (mask & (1 << SI_AUDIOD_STATUS)) {
-		char *s = audiod_status_string();
-		ret = client_write(fd, s);
-		if (ret < 0)
-			goto out;
-		free(s);
-	}
-	if (mask & (1 << SI_DECODER_FLAGS)) {
-		char *df =decoder_flags();
-		ret = client_write(fd, df);
-		if (ret < 0)
-			goto out;
-		free(df);
-	}
-
-	for (i = 0; i < NUM_STAT_ITEMS; i++) {
-		char *tmp, *v;
-		if (!((1 << i) & mask))
+	PARA_INFO_LOG("mask: 0x%llx\n", (long long unsigned)mask);
+	FOR_EACH_STATUS_ITEM(i) {
+		char *item = stat_item_values[i];
+		if (!((one << i) & mask))
 			continue;
-		v = stat_task->stat_item_values[i];
-		tmp = make_message("%s%s%s", buf? buf: "",
-			v? v : "", v? "\n" : "");
-		free(buf);
-		buf = tmp;
+		WRITE_STATUS_ITEM(&b, i, "%s\n", item? item : "");
 	}
-	ret = client_write(fd, buf);
-out:
-	if (ret > 0)
-		ret = stat_client_add(fd, mask);
-	free(buf);
+	ret = client_write(fd, b.buf);
+	if (ret >= 0)
+		ret = stat_client_add(fd, mask, parser_friendly);
+	free(b.buf);
 	return ret;
 }
 
-static struct filter_node *find_filter_node(int slot_num, int format, int filternum)
-{
-	struct filter_node *fn;
-	int i, j;
-
-	FOR_EACH_SLOT(i) {
-		struct slot_info *s = &slot[i];
-		if (s->format < 0 || !s->fc)
-			continue;
-		if (slot_num >= 0 && slot_num != i)
-			continue;
-		if (format >= 0 && s->format != format)
-			continue;
-		if (num_filters(i) < filternum)
-			continue;
-		/* success */
-		j = 1;
-		list_for_each_entry(fn, &s->fc->filters, node)
-			if (filternum <= 0 || j++ == filternum)
-				break;
-		return fn;
-	}
-	return NULL;
-}
-
-static int com_grab(int fd, char *cmdline)
+int com_grab(int fd, int argc, char **argv)
 {
-	struct grab_client *gc;
-	struct filter_node *fn;
-	int i, err;
-	char *msg;
-
-	gc = grab_client_new(fd, cmdline, &err);
-	if (!gc)
-		goto err_out;
-	fn = find_filter_node(gc->conf->slot_arg, gc->audio_format_num, gc->conf->filter_num_arg);
-	if (fn)
-		activate_grab_client(gc, fn);
-	return 1;
-err_out:
-	if (err != -E_GC_HELP_GIVEN && err != -E_GC_VERSION_GIVEN)
-		return err;
-	if (err == -E_GC_HELP_GIVEN) {
-		msg = make_message("%s\n\n", grab_client_args_info_usage);
-		for (i = 0; grab_client_args_info_help[i]; i++) {
-			char *tmp = make_message("%s%s\n", msg,
-				grab_client_args_info_help[i]);
-			free(msg);
-			msg = tmp;
-		}
-	} else
-		msg = make_message("%s %s\n",
-			GRAB_CLIENT_CMDLINE_PARSER_PACKAGE,
-			GRAB_CLIENT_CMDLINE_PARSER_VERSION);
-	err = client_write(fd, msg);
-	free(msg);
-	if (err < 0)
-		return err;
-	close(fd);
-	return 1;
+	return grab_client_new(fd, argc, argv);
 }
 
-static int __noreturn com_term(int fd, __a_unused int argc, __a_unused char **argv)
+__noreturn int com_term(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	close(fd);
 	clean_exit(EXIT_SUCCESS, "terminating on user request");
 }
 
-static int com_on(int fd, __a_unused int argc, __a_unused char **argv)
+int com_on(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)
+int com_off(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)
+int com_sb(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)
+int com_cycle(int fd, int argc, char **argv)
 {
 	switch (audiod_status) {
 		case  AUDIOD_ON:
@@ -549,56 +413,56 @@ static int check_perms(uid_t uid)
 	return -E_UCRED_PERM;
 }
 
+/**
+ * handle arriving connections on the local socket
+ *
+ * \param accept_fd the fd to call accept() on
+ *
+ * This is called whenever para_audiod's main task detects an incoming
+ * connection by the readability of \a accept_fd. This 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.
+ *
+ * \return positive on success, negative on errors
+ *
+ * \sa para_accept(), recv_cred_buffer()
+ * */
 int handle_connect(int accept_fd)
 {
 	int i, argc, ret, clifd = -1;
-	char *cmd = NULL, *p, *buf = para_calloc(MAXLINE), **argv = NULL;
+	char buf[MAXLINE], **argv = NULL;
 	struct sockaddr_un unix_addr;
+	uid_t uid;
 
 	ret = para_accept(accept_fd, &unix_addr, sizeof(struct sockaddr_un));
 	if (ret < 0)
 		goto out;
 	clifd = ret;
-	ret = recv_cred_buffer(clifd, buf, MAXLINE - 1);
+	ret = recv_cred_buffer(clifd, buf, sizeof(buf) - 1);
 	if (ret < 0)
 		goto out;
+	uid = ret;
 	PARA_INFO_LOG("connection from user %i, buf: %s\n",  ret, buf);
-	ret = check_perms(ret);
+	ret = check_perms(uid);
 	if (ret < 0)
 		goto out;
-	ret = -E_INVALID_AUDIOD_CMD;
-	cmd = para_strdup(buf);
-	p = strchr(cmd, '\n');
-	if (!p)
-		p = "";
-	else {
-		*p = '\0';
-		p++;
-	}
-	for (i = 0; cmds[i].name; i++) {
-		int j;
-		if (strcmp(cmds[i].name, cmd))
+	ret = create_argv(buf, "\n", &argv);
+	if (ret < 0)
+		goto out;
+	argc = ret;
+	//PARA_INFO_LOG("argv[0]: %s, argc = %d\n", argv[0], argc);
+	FOR_EACH_COMMAND(i) {
+		if (strcmp(audiod_cmds[i].name, argv[0]))
 			continue;
-		if (cmds[i].handler) {
-			argc = split_args(buf, &argv, "\n");
-			PARA_INFO_LOG("argv[0]: %s, argc= %d\n", argv[0], argc);
-			ret = cmds[i].handler(clifd, argc, argv);
-			goto out;
-		}
-		for (j = 0; p[j]; j++)
-			if (p[j] == '\n')
-				p[j] = ' ';
-		PARA_INFO_LOG("cmd: %s, options: %s\n", cmd, p);
-		ret = cmds[i].line_handler(clifd, p);
+		ret = audiod_cmds[i].handler(clifd, argc, argv);
 		goto out;
 	}
 	ret = -E_INVALID_AUDIOD_CMD;
 out:
-	free(cmd);
-	free(buf);
-	free(argv);
+	free_argv(argv);
 	if (clifd > 0 && ret < 0 && ret != -E_CLIENT_WRITE) {
-		char *tmp = make_message("%s\n", PARA_STRERROR(-ret));
+		char *tmp = make_message("%s\n", para_strerror(-ret));
 		client_write(clifd, tmp);
 		free(tmp);
 		close(clifd);
@@ -606,35 +470,66 @@ out:
 	return ret;
 }
 
+/**
+ * Send the current audiod status to all connected stat clients.
+ */
 void audiod_status_dump(void)
 {
-	static char *p_ts, *p_us, *p_as, *p_df;
-	struct timeval *t = wstime();
-	char *us, *tmp = get_time_string(t);
-
-	if (tmp && (!p_ts || strcmp(tmp, p_ts)))
-		stat_client_write(tmp, SI_PLAY_TIME);
-	free(p_ts);
-	p_ts = tmp;
-
-	us = uptime_str();
-	tmp = make_message("%s:%s\n", status_item_list[SI_AUDIOD_UPTIME], us);
-	free(us);
-	if (!p_us || strcmp(p_us, tmp))
-		stat_client_write(tmp, SI_AUDIOD_UPTIME);
-	free(p_us);
-	p_us = tmp;
-
-	tmp = audiod_status_string();
-	if (!p_as || strcmp(p_as, tmp))
-		stat_client_write(tmp, SI_AUDIOD_STATUS);
-	free(p_as);
-	p_as = tmp;
-
-	tmp = decoder_flags();
-	if (!p_df || strcmp(p_df, tmp))
-		stat_client_write(tmp, SI_DECODER_FLAGS);
-	free(p_df);
-	p_df = tmp;
+	int slot_num = get_play_time_slot_num();
+	char *old, *new;
+
+	old = stat_item_values[SI_PLAY_TIME];
+	new = get_time_string(slot_num);
+	if (new) {
+		if (!old || strcmp(old, new)) {
+			free(old);
+			stat_item_values[SI_PLAY_TIME] = new;
+			stat_client_write_item(SI_PLAY_TIME);
+		} else
+			free(new);
+	}
+
+	new = uptime_str();
+	old = stat_item_values[SI_AUDIOD_UPTIME];
+	if (!old || strcmp(old, new)) {
+		free(old);
+		stat_item_values[SI_AUDIOD_UPTIME] = new;
+		stat_client_write_item(SI_AUDIOD_UPTIME);
+	} else
+		free(new);
+
+	old = stat_item_values[SI_AUDIOD_STATUS];
+	new = audiod_status_string();
+	if (!old || strcmp(old, new)) {
+		free(old);
+		stat_item_values[SI_AUDIOD_STATUS] = new;
+		stat_client_write_item(SI_AUDIOD_STATUS);
+	} else
+		free(new);
+
+	old = stat_item_values[SI_DECODER_FLAGS];
+	new = decoder_flags();
+	if (!old || strcmp(old, new)) {
+		free(old);
+		stat_item_values[SI_DECODER_FLAGS] = new;
+		stat_client_write_item(SI_DECODER_FLAGS);
+	} else
+		free(new);
 }
 
+/**
+ * Flush and send all status items.
+ *
+ * Send to  each connected client the full status item list
+ * with empty values.
+ */
+void clear_and_dump_items(void)
+{
+	int i;
+
+	FOR_EACH_STATUS_ITEM(i) {
+		free(stat_item_values[i]);
+		stat_item_values[i] = NULL;
+		stat_client_write_item(i);
+	}
+}