X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=da5a2dc5e882a4de2fe61152a6d0979f3dd04cf5;hp=a6f6776267b1183ec947cf4bbfdf268fe3e8077d;hb=8b0ab0837ecdd5d28c7b6f31a605552f6942ca64;hpb=00e4d4da1b2c00da139b09d3ed4ab9ad9fba2691

diff --git a/audiod_command.c b/audiod_command.c
index a6f67762..da5a2dc5 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -16,7 +16,6 @@
 #include "sched.h"
 #include "ggo.h"
 #include "filter.h"
-#include "grab_client.cmdline.h"
 #include "grab_client.h"
 
 #include "error.h"
@@ -35,7 +34,11 @@ extern char *stat_item_values[NUM_STAT_ITEMS];
 
 static int client_write(int fd, const char *buf)
 {
-	size_t len = strlen(buf);
+	size_t len;
+
+	if (!buf)
+		return 0;
+	len = strlen(buf);
 	return write(fd, buf, len) != len? -E_CLIENT_WRITE: 1;
 }
 
@@ -43,23 +46,25 @@ __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;
@@ -70,13 +75,14 @@ __malloc static char *decoder_flags(void)
 		char flag = '0';
 		if (s->receiver_node)
 			flag += 1;
-		if (s->wng)
+		if (s->fc)
 			flag += 2;
+		if (s->wng)
+			flag += 4;
 		flags[i] = flag;
 	}
 	flags[MAX_STREAM_SLOTS] = '\0';
-	return make_message("%s: %s\n", status_item_list[SI_DECODER_FLAGS],
-		flags);
+	return para_strdup(flags);
 }
 
 static int dump_commands(int fd)
@@ -164,129 +170,52 @@ int com_kill(int fd, int argc, char **argv)
 	return ret;
 }
 
-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);
-	}
-	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);
+			return ret;
+		mask |= (one << ret);
 	}
+	PARA_INFO_LOG("mask: 0x%llx\n", (long long unsigned)mask);
 	FOR_EACH_STATUS_ITEM(i) {
-		char *tmp, *v;
-		if (!((1 << i) & mask))
+		char *item = stat_item_values[i];
+		if (!((one << i) & mask))
 			continue;
-		v = 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)
-{
-	int i;
-
-	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 */
-		return  s->fc->filter_nodes + filternum;
-	}
-	return NULL;
-}
-
-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);
 }
 
 __noreturn int com_term(int fd, __a_unused int argc, __a_unused char **argv)
@@ -363,7 +292,7 @@ static int check_perms(uid_t uid)
 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;
 
@@ -371,7 +300,7 @@ int handle_connect(int accept_fd)
 	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;
@@ -379,37 +308,20 @@ int handle_connect(int accept_fd)
 	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; audiod_cmds[i].name; i++) {
-		int j;
-		if (strcmp(audiod_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 (audiod_cmds[i].handler) {
-			argc = split_args(buf, &argv, "\n");
-			PARA_INFO_LOG("argv[0]: %s, argc= %d\n", argv[0], argc);
-			ret = audiod_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 = audiod_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));
 		client_write(clifd, tmp);
@@ -418,21 +330,22 @@ out:
 	}
 	return ret;
 }
+
 /**
- * send the current audiod status to all connected stat clients
+ * Send the current audiod status to all connected stat clients.
  */
 void audiod_status_dump(void)
 {
-	struct timeval *t = wstime();
-	char *old, *new, *tmp;
+	int slot_num = get_play_time_slot_num();
+	char *old, *new;
 
 	old = stat_item_values[SI_PLAY_TIME];
-	new = get_time_string(t);
+	new = get_time_string(slot_num);
 	if (new) {
 		if (!old || strcmp(old, new)) {
 			free(old);
-			stat_client_write(new, SI_PLAY_TIME);
 			stat_item_values[SI_PLAY_TIME] = new;
+			stat_client_write_item(SI_PLAY_TIME);
 		} else
 			free(new);
 	}
@@ -441,11 +354,8 @@ void audiod_status_dump(void)
 	old = stat_item_values[SI_AUDIOD_UPTIME];
 	if (!old || strcmp(old, new)) {
 		free(old);
-		tmp = make_message("%s: %s\n",
-			status_item_list[SI_AUDIOD_UPTIME], new);
-		stat_client_write(tmp, SI_AUDIOD_UPTIME);
-		free(tmp);
 		stat_item_values[SI_AUDIOD_UPTIME] = new;
+		stat_client_write_item(SI_AUDIOD_UPTIME);
 	} else
 		free(new);
 
@@ -453,8 +363,8 @@ void audiod_status_dump(void)
 	new = audiod_status_string();
 	if (!old || strcmp(old, new)) {
 		free(old);
-		stat_client_write(new, SI_AUDIOD_STATUS);
 		stat_item_values[SI_AUDIOD_STATUS] = new;
+		stat_client_write_item(SI_AUDIOD_STATUS);
 	} else
 		free(new);
 
@@ -462,27 +372,25 @@ void audiod_status_dump(void)
 	new = decoder_flags();
 	if (!old || strcmp(old, new)) {
 		free(old);
-		stat_client_write(new, SI_DECODER_FLAGS);
 		stat_item_values[SI_DECODER_FLAGS] = new;
+		stat_client_write_item(SI_DECODER_FLAGS);
 	} else
 		free(new);
 }
 
 /**
- * send empty status list
+ * Flush and send all status items.
  *
  * Send to  each connected client the full status item list
  * with empty values.
  */
-void dump_empty_status(void)
+void clear_and_dump_items(void)
 {
 	int i;
 
 	FOR_EACH_STATUS_ITEM(i) {
-		char *tmp = make_message("%s:\n", status_item_list[i]);
-		stat_client_write(tmp, i);
-		free(tmp);
 		free(stat_item_values[i]);
 		stat_item_values[i] = NULL;
+		stat_client_write_item(i);
 	}
 }