X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=e65f747a50625b99fd3c06c69c62f30d475ddbac;hp=2f3726faed46a8d004d4111a9e503a70851af511;hb=823a4ff87a03ff9e1d2bfe8bc501f55ee4213649;hpb=f652ce6afe7f6fd0e42814505234cbf4321a736e

diff --git a/audiod_command.c b/audiod_command.c
index 2f3726fa..e65f747a 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,13 +1,18 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file audiod_command.c Commands for para_audiod. */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "audiod.cmdline.h"
@@ -30,7 +35,7 @@ extern struct sched sched;
 extern char *stat_item_values[NUM_STAT_ITEMS];
 
 
-struct audiod_command audiod_cmds[] = {DEFINE_AUDIOD_CMD_ARRAY};
+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++)
@@ -109,6 +114,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.
  *
@@ -127,7 +157,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;
@@ -135,15 +165,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);
@@ -320,7 +346,6 @@ static 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)
@@ -442,7 +467,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);
@@ -466,8 +491,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;
@@ -475,7 +502,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);
@@ -483,9 +510,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);
@@ -494,7 +521,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);
@@ -503,7 +530,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);