X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=df8f3936faf89a2c5b5550901d2e6e9bcf12ebdb;hp=dfb014aebc1c1d12659364189ac79813c952139c;hb=d1e7875caba9aface190dab0de394435a80edd21;hpb=a5ad3d4c598bafe28e90e5b623e0a754d6e973d5

diff --git a/audiod_command.c b/audiod_command.c
index dfb014ae..df8f3936 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,14 +1,18 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file audiod_command.c commands for para_audiod */
+/** \file audiod_command.c Commands for para_audiod. */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
-#include <stdbool.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "audiod.cmdline.h"
@@ -25,10 +29,15 @@
 #include "string.h"
 #include "write.h"
 #include "fd.h"
-#include "audiod_command_list.h"
+#include "version.h"
+#include "audiod.command_list.h"
 
+extern struct sched sched;
 extern char *stat_item_values[NUM_STAT_ITEMS];
 
+
+static struct audiod_command audiod_cmds[] = {DEFINE_AUDIOD_CMD_ARRAY};
+
 /** Iterate over the array of all audiod commands. */
 #define FOR_EACH_COMMAND(c) for (c = 0; audiod_cmds[c].name; c++)
 
@@ -106,6 +115,31 @@ static int stat_client_add(int fd, uint64_t mask, int parser_friendly)
 	num_clients++;
 	return 1;
 }
+
+static void close_stat_client(struct stat_client *sc)
+{
+	PARA_INFO_LOG("closing client fd %d\n", sc->fd);
+	close(sc->fd);
+	list_del(&sc->node);
+	free(sc);
+	num_clients--;
+}
+
+/**
+ * Empty the status clients list.
+ *
+ * This iterates over the list of connected status clients, closes each client
+ * file descriptor and frees the resources.
+ */
+void close_stat_clients(void)
+{
+	struct stat_client *sc, *tmp;
+
+	list_for_each_entry_safe(sc, tmp, &client_list, node)
+		close_stat_client(sc);
+	assert(num_clients == 0);
+}
+
 /**
  * Write a message to all connected status clients.
  *
@@ -124,7 +158,7 @@ void stat_client_write_item(int item_num)
 	struct para_buffer *b;
 
 	list_for_each_entry_safe(sc, tmp, &client_list, node) {
-		int fd = sc->fd, ret;
+		int ret;
 
 		if (!((one << item_num) & sc->item_mask))
 			continue;
@@ -132,15 +166,11 @@ void stat_client_write_item(int item_num)
 		if (!b->buf)
 			(void)WRITE_STATUS_ITEM(b, item_num, "%s\n",
 				msg? msg : "");
-		ret = write(fd, b->buf, b->offset);
+		ret = write(sc->fd, b->buf, b->offset);
 		if (ret == b->offset)
 			continue;
 		/* write error or short write */
-		close(fd);
-		num_clients--;
-		PARA_INFO_LOG("deleting client on fd %d\n", fd);
-		list_del(&sc->node);
-		free(sc);
+		close_stat_client(sc);
 		dump_stat_client_list();
 	}
 	free(pb.buf);
@@ -249,7 +279,7 @@ static int dump_commands(int fd)
  * to each individual command to close the fd if necessary.
  */
 
-int com_help(int fd, int argc, char **argv)
+static int com_help(int fd, int argc, char **argv)
 {
 	int i, ret;
 	char *buf;
@@ -284,9 +314,9 @@ out:
 	return ret;
 }
 
-int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
 {
-	char *tl = get_task_list();
+	char *tl = get_task_list(&sched);
 	int ret = 1;
 	if (tl)
 		ret = client_write(fd, tl);
@@ -296,7 +326,7 @@ int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
 	return ret;
 }
 
-int com_stat(int fd, int argc, char **argv)
+static int com_stat(int fd, int argc, char **argv)
 {
 	int i, ret, parser_friendly = 0;
 	uint64_t mask = 0;
@@ -317,7 +347,6 @@ int com_stat(int fd, int argc, char **argv)
 		if (!strncmp(arg, "-p", 2)) {
 			parser_friendly = 1;
 			b.flags = PBF_SIZE_PREFIX;
-			continue;
 		}
 	}
 	if (i >= argc)
@@ -342,39 +371,39 @@ int com_stat(int fd, int argc, char **argv)
 	return ret;
 }
 
-int com_grab(int fd, int argc, char **argv)
+static int com_grab(int fd, int argc, char **argv)
 {
-	return grab_client_new(fd, argc, argv);
+	return grab_client_new(fd, argc, argv, &sched);
 }
 
-__noreturn int com_term(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_term(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	close(fd);
-	clean_exit(EXIT_SUCCESS, "terminating on user request");
+	return -E_AUDIOD_TERM;
 }
 
-int com_on(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_on(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	audiod_status = AUDIOD_ON;
 	close(fd);
 	return 1;
 }
 
-int com_off(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_off(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	audiod_status = AUDIOD_OFF;
 	close(fd);
 	return 1;
 }
 
-int com_sb(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_sb(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	audiod_status = AUDIOD_STANDBY;
 	close(fd);
 	return 1;
 }
 
-int com_cycle(int fd, int argc, char **argv)
+static int com_cycle(int fd, int argc, char **argv)
 {
 	switch (audiod_status) {
 		case  AUDIOD_ON:
@@ -391,6 +420,22 @@ int com_cycle(int fd, int argc, char **argv)
 	return 1;
 }
 
+static int com_version(int fd, int argc, char **argv)
+{
+	int ret;
+	char *msg;
+
+	if (argc > 1 && strcmp(argv[1], "-v") == 0)
+		msg = make_message("%s", version_text("audiod"));
+	else
+		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;
@@ -439,7 +484,7 @@ int handle_connect(int accept_fd, fd_set *rfds)
 	if (ret < 0)
 		goto out;
 	ret = create_argv(buf, "\n", &argv);
-	if (ret < 0)
+	if (ret <= 0)
 		goto out;
 	argc = ret;
 	//PARA_INFO_LOG("argv[0]: %s, argc = %d\n", argv[0], argc);
@@ -463,8 +508,10 @@ out:
 
 /**
  * Send the current audiod status to all connected stat clients.
+ *
+ * \param force Whether to write unchanged items.
  */
-void audiod_status_dump(void)
+void audiod_status_dump(bool force)
 {
 	int slot_num = get_play_time_slot_num();
 	char *old, *new;
@@ -472,7 +519,7 @@ void audiod_status_dump(void)
 	old = stat_item_values[SI_PLAY_TIME];
 	new = get_time_string(slot_num);
 	if (new) {
-		if (!old || strcmp(old, new)) {
+		if (force || !old || strcmp(old, new)) {
 			free(old);
 			stat_item_values[SI_PLAY_TIME] = new;
 			stat_client_write_item(SI_PLAY_TIME);
@@ -480,9 +527,9 @@ void audiod_status_dump(void)
 			free(new);
 	}
 
-	new = get_server_uptime_str(now);
+	new = daemon_get_uptime_str(now);
 	old = stat_item_values[SI_AUDIOD_UPTIME];
-	if (!old || strcmp(old, new)) {
+	if (force || !old || strcmp(old, new)) {
 		free(old);
 		stat_item_values[SI_AUDIOD_UPTIME] = new;
 		stat_client_write_item(SI_AUDIOD_UPTIME);
@@ -491,7 +538,7 @@ void audiod_status_dump(void)
 
 	old = stat_item_values[SI_AUDIOD_STATUS];
 	new = audiod_status_string();
-	if (!old || strcmp(old, new)) {
+	if (force || !old || strcmp(old, new)) {
 		free(old);
 		stat_item_values[SI_AUDIOD_STATUS] = new;
 		stat_client_write_item(SI_AUDIOD_STATUS);
@@ -500,7 +547,7 @@ void audiod_status_dump(void)
 
 	old = stat_item_values[SI_DECODER_FLAGS];
 	new = decoder_flags();
-	if (!old || strcmp(old, new)) {
+	if (force || !old || strcmp(old, new)) {
 		free(old);
 		stat_item_values[SI_DECODER_FLAGS] = new;
 		stat_client_write_item(SI_DECODER_FLAGS);