X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=accf0244f957809b9c55b7e56b61127492264d62;hp=e73d14135b855b77f361a020d5c0484c4842b13f;hb=837cd1ab890645d9fd7d0d85139fdf076d987ea4;hpb=5ab451760281b344bfa6e495ab1aea7d80323c3c

diff --git a/audiod.c b/audiod.c
index e73d1413..accf0244 100644
--- a/audiod.c
+++ b/audiod.c
@@ -14,6 +14,7 @@
 #include <sys/un.h>
 #include <netdb.h>
 #include <signal.h>
+#include <pwd.h>
 
 #include "para.h"
 #include "error.h"
@@ -68,6 +69,30 @@ struct audio_format_info {
 	struct timeval restart_barrier;
 };
 
+/* Describes one instance of a receiver-filter-writer chain. */
+struct slot_info {
+	/* Number of the audio format in this slot. */
+	int format;
+	/* The stream_start status item announced by para_server.  */
+	struct timeval server_stream_start;
+	/* The offset status item announced by para_server. */
+	unsigned offset_seconds;
+	/* The seconds_total status item announced by para_server. */
+	unsigned seconds_total;
+	/* The receiver info associated with this slot. */
+	struct receiver_node *receiver_node;
+	/* The array of filter nodes. */
+	struct filter_node *fns;
+	/* The array of writers attached to the last filter. */
+	struct writer_node *wns;
+};
+
+/** Maximal number of simultaneous instances. */
+#define MAX_STREAM_SLOTS 5
+
+/** Iterate over all slots. */
+#define FOR_EACH_SLOT(_slot) for (_slot = 0; _slot < MAX_STREAM_SLOTS; _slot++)
+
 /**
  * para_audiod uses \p MAX_STREAM_SLOTS different slots, each of which may
  * be associated with a receiver/filter/writer triple. This array holds all
@@ -148,6 +173,8 @@ static struct signal_task *signal_task;
 
 static struct status_task status_task_struct;
 
+static uid_t *uid_whitelist;
+
 /**
  * the task that calls the status command of para_server
  *
@@ -198,6 +225,35 @@ static int get_audio_format_num(const char *name)
 	return -E_UNSUPPORTED_AUDIO_FORMAT;
 }
 
+/**
+ * Return the flags for the \a decoder_flags status item.
+ *
+ * Allocates a string which contains one octal digit per slot.  Bit zero (value
+ * 1) is set if a receiver is active. Bit one (value 2) and bit three (value 4)
+ * have the analogous meaning for filter and writer, respectively.
+ *
+ * \return String that must be freed by the caller.
+ */
+__malloc char *audiod_get_decoder_flags(void)
+{
+	int i;
+	char flags[MAX_STREAM_SLOTS + 1];
+
+	FOR_EACH_SLOT(i) {
+		struct slot_info *s = &slot[i];
+		char flag = '0';
+		if (s->receiver_node)
+			flag += 1;
+		if (s->fns)
+			flag += 2;
+		if (s->wns)
+			flag += 4;
+		flags[i] = flag;
+	}
+	flags[MAX_STREAM_SLOTS] = '\0';
+	return para_strdup(flags);
+}
+
 static int get_matching_audio_format_nums(const char *re)
 {
 	int i, ret;
@@ -337,7 +393,7 @@ empty:
 
 static void parse_config_or_die(void)
 {
-	int ret;
+	int ret, i;
 	char *config_file;
 	struct audiod_cmdline_parser_params params = {
 		.override = 0,
@@ -357,6 +413,7 @@ static void parse_config_or_die(void)
 	ret = file_exists(config_file);
 	if (conf.config_file_given && !ret) {
 		PARA_EMERG_LOG("can not read config file %s\n", config_file);
+		free(config_file);
 		goto err;
 	}
 	if (ret) {
@@ -364,9 +421,29 @@ static void parse_config_or_die(void)
 		daemon_set_loglevel(conf.loglevel_arg);
 	}
 	free(config_file);
+	if (conf.user_allow_given > 0) {
+		uid_whitelist = para_malloc(conf.user_allow_given
+			* sizeof(uid_t));
+		for (i = 0; i < conf.user_allow_given; i++) {
+			int32_t val;
+			struct passwd *pw;
+			ret = para_atoi32(conf.user_allow_arg[i], &val);
+			if (ret >= 0) {
+				uid_whitelist[i] = val;
+				continue;
+			}
+			errno = 0; /* see getpwnam(3) */
+			pw = getpwnam(conf.user_allow_arg[i]);
+			if (!pw) {
+				PARA_EMERG_LOG("invalid username: %s\n",
+					conf.user_allow_arg[i]);
+				goto err;
+			}
+			uid_whitelist[i] = pw->pw_uid;
+		}
+	}
 	return;
 err:
-	free(config_file);
 	exit(EXIT_FAILURE);
 }
 
@@ -1046,7 +1123,7 @@ static int command_post_select(struct sched *s, void *context)
 	for (i = 0; i < 2; i++) {
 		if (ct->fd[i] < 0)
 			continue;
-		ret = handle_connect(ct->fd[i], &s->rfds);
+		ret = handle_connect(ct->fd[i], &s->rfds, uid_whitelist);
 		if (ret < 0) {
 			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 			if (ret == -E_AUDIOD_TERM) {
@@ -1173,6 +1250,7 @@ static void audiod_cleanup(void)
 	close_unused_slots();
 	audiod_cmdline_parser_free(&conf);
 	close_stat_clients();
+	free(uid_whitelist);
 }
 
 /*
@@ -1415,7 +1493,7 @@ int main(int argc, char *argv[])
 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 		exit(EXIT_FAILURE);
 	}
-	daemon_log_welcome("para_audiod");
+	daemon_log_welcome("audiod");
 	daemon_set_start_time();
 	set_initial_status();
 	FOR_EACH_SLOT(i)