X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=df8f3936faf89a2c5b5550901d2e6e9bcf12ebdb;hp=118c22a00351504f5a81040cae0045ce74641be9;hb=cb4f8bc9718816110bef77ed1ba124d723c253b5;hpb=32a078f2f75bcd26cccd17418c901c3b2c85b1cc

diff --git a/audiod_command.c b/audiod_command.c
index 118c22a0..df8f3936 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@tuebingen.mpg.de>
  *
  * 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"
@@ -24,7 +29,8 @@
 #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];
@@ -370,10 +376,10 @@ static int com_grab(int fd, int argc, char **argv)
 	return grab_client_new(fd, argc, argv, &sched);
 }
 
-__noreturn static 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;
 }
 
 static int com_on(int fd, __a_unused int argc, __a_unused char **argv)
@@ -414,6 +420,22 @@ static 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;
@@ -486,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;
@@ -495,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);
@@ -503,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);
@@ -514,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);
@@ -523,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);