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

diff --git a/audiod_command.c b/audiod_command.c
index 118c22a0..5c7d2d53 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 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,14 +420,30 @@ static int com_cycle(int fd, int argc, char **argv)
 	return 1;
 }
 
-static int check_perms(uid_t uid)
+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, uid_t *whitelist)
 {
 	int i;
 
 	if (!conf.user_allow_given)
 		return 1;
 	for (i = 0; i < conf.user_allow_given; i++)
-		if (uid == conf.user_allow_arg[i])
+		if (uid == whitelist[i])
 			return 1;
 	return -E_UCRED_PERM;
 }
@@ -431,6 +453,7 @@ static int check_perms(uid_t uid)
  *
  * \param accept_fd The fd to accept connections on.
  * \param rfds If \a accept_fd is not set in \a rfds, do nothing.
+ * \param uid_whitelist Array of UIDs which are allowed to connect.
  *
  * This is called in each iteration of the select loop. If there is an incoming
  * connection on \a accept_fd, this function reads the command sent by the peer,
@@ -443,7 +466,7 @@ static int check_perms(uid_t uid)
  *
  * \sa para_accept(), recv_cred_buffer()
  * */
-int handle_connect(int accept_fd, fd_set *rfds)
+int handle_connect(int accept_fd, fd_set *rfds, uid_t *uid_whitelist)
 {
 	int i, argc, ret, clifd;
 	char buf[MAXLINE], **argv = NULL;
@@ -458,7 +481,7 @@ int handle_connect(int accept_fd, fd_set *rfds)
 		goto out;
 	uid = ret;
 	PARA_INFO_LOG("connection from user %i, buf: %s\n",  ret, buf);
-	ret = check_perms(uid);
+	ret = check_perms(uid, uid_whitelist);
 	if (ret < 0)
 		goto out;
 	ret = create_argv(buf, "\n", &argv);
@@ -486,8 +509,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 +520,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 +528,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 +539,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 +548,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);