X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=bd97f15e22e1629e8b9b0895420438dd5fb46194;hp=8b9422bc322b8c989a9f04456dd1d50253f68e5d;hb=121015ff5cdbe6af7b84f6245ebe62fe2a52a859;hpb=a7b65e41e2062c44c535f7cb4609e7988fc8ac0d

diff --git a/audiod.c b/audiod.c
index 8b9422bc..bd97f15e 100644
--- a/audiod.c
+++ b/audiod.c
@@ -164,7 +164,7 @@ int audiod_status = AUDIOD_ON;
  * the gengetopt args_info struct that holds information on all command line
  * arguments
  */
-struct audiod_args_info conf;
+static struct audiod_args_info conf;
 
 static char *socket_name;
 static struct audio_format_info afi[NUM_AUDIO_FORMATS];
@@ -309,7 +309,7 @@ static int get_play_time_slot_num(void)
  */
 char *get_time_string(void)
 {
-	int ret, seconds = 0, length;
+	int ret, seconds = 0, length = stat_task->length_seconds;
 	struct timeval *tmp, sum, sss, /* server stream start */
 		rstime, /* receiver start time */
 		wstime, /* writer start time */
@@ -321,8 +321,10 @@ char *get_time_string(void)
 
 	if (audiod_status == AUDIOD_OFF)
 		goto empty;
-	if (!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING)) {
-		if (stat_task->length_seconds) /* paused */
+	if (stat_task->server_stream_start.tv_sec == 0) {
+		if (stat_task->vss_status & VSS_STATUS_FLAG_PLAYING)
+			goto out; /* server is about to change file */
+		if (length > 0) /* paused */
 			return NULL;
 		goto empty; /* stopped */
 	}
@@ -331,7 +333,6 @@ char *get_time_string(void)
 	 * start. We use the slot info and fall back to the info from current
 	 * status items if no slot info is available.
 	 */
-	length = stat_task->length_seconds;
 	tmp = &stat_task->server_stream_start;
 	if (s && s->wns && s->wns[0].btrn) { /* writer active in this slot */
 		btr_get_node_start(s->wns[0].btrn, &wstime);
@@ -350,7 +351,7 @@ char *get_time_string(void)
 		tv_diff(tmp, &stat_task->sa_time_diff, &sss);
 	else
 		tv_add(tmp, &stat_task->sa_time_diff, &sss);
-	if (!s || !s->wns || !s->wns[0].btrn) {
+	if (!s || !s->wns || !s->wns[0].btrn || wstime.tv_sec == 0) {
 		struct timeval diff;
 		tv_diff(now, &sss, &diff);
 		seconds = diff.tv_sec + stat_task->offset_seconds;
@@ -362,7 +363,8 @@ char *get_time_string(void)
 	if (s->receiver_node->btrn) {
 		btr_get_node_start(s->receiver_node->btrn, &rstime);
 		ret = tv_diff(&rstime, &sss, &rskip);
-		if (ret > 0) { /* audiod was started in the middle of the stream */
+		if (ret > 0 && rskip.tv_sec > 2) {
+			/* audiod was started in the middle of the stream */
 			tv_add(&wtime, &rskip, &sum);
 			seconds += sum.tv_sec;
 		} else
@@ -594,7 +596,8 @@ static void open_filters(struct slot_info *s)
 			EMBRACE(.name = f->name, .parent = parent,
 				.handler = f->execute, .context = fn));
 
-		f->open(fn);
+		if (f->open)
+			f->open(fn);
 		sprintf(buf, "%s (slot %d)", f->name, (int)(s - slot));
 		fn->task = task_register(&(struct task_info) {
 			.name = buf,
@@ -761,7 +764,7 @@ static void compute_time_diff(const struct timeval *status_time)
 	if (count > 5) {
 		int s = tv_diff(&diff, &stat_task->sa_time_diff, &tmp);
 		if (tv_diff(&max_deviation, &tmp, NULL) < 0)
-			PARA_WARNING_LOG("time diff jump: %lims\n",
+			PARA_WARNING_LOG("time diff jump: %lums\n",
 				s * tv2ms(&tmp));
 	}
 	count++;
@@ -1070,7 +1073,7 @@ static void init_local_sockets(struct command_task *ct)
 		unlink(socket_name);
 	ct->fd[0] = create_local_socket(socket_name, 0);
 	ct->fd[1] = create_local_socket(socket_name,
-		S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
+		S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
 	if (ct->fd[0] >= 0 || ct->fd[1] >= 0)
 		return;
 	PARA_EMERG_LOG("%s\n", para_strerror(-ct->fd[1]));
@@ -1121,7 +1124,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, uid_whitelist);
+		ret = handle_connect(ct->fd[i], &s->rfds);
 		if (ret < 0) {
 			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 			if (ret == -E_AUDIOD_TERM) {
@@ -1228,10 +1231,15 @@ static void close_slot(int slot_num)
 static void close_unused_slots(void)
 {
 	int i;
+	bool dump = false;
 
 	FOR_EACH_SLOT(i)
-		if (must_close_slot(i))
+		if (must_close_slot(i)) {
 			close_slot(i);
+			dump = true;
+		}
+	if (dump)
+		audiod_status_dump(true);
 }
 
 /*
@@ -1276,6 +1284,7 @@ static void start_stop_decoders(void)
 	open_writers(sl);
 	activate_grab_clients(&sched);
 	btr_log_tree(sl->receiver_node->btrn, LL_NOTICE);
+	audiod_status_dump(true);
 }
 
 static void status_pre_select(struct sched *s, void *context)
@@ -1369,7 +1378,7 @@ static int status_post_select(struct sched *s, void *context)
 	if (st->clock_diff_count) { /* get status only one time */
 		char *argv[] = {"audiod", "--", "stat", "-p", "-n=1", NULL};
 		int argc = 5;
-		PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count);
+		PARA_INFO_LOG("clock diff count: %u\n", st->clock_diff_count);
 		st->clock_diff_count--;
 		client_open(argc, argv, &st->ct, NULL, NULL, st->btrn, s);
 		set_stat_task_restart_barrier(2);
@@ -1440,6 +1449,29 @@ __noreturn static void print_help_and_die(void)
 	exit(0);
 }
 
+/**
+ * Lookup the given UID in the whitelist.
+ *
+ * The whitelist is the array of arguments to the --user-allow opion. If the
+ * option was not given, the array is empty, in which case the check succeeds.
+ *
+ * \param uid User ID to look up.
+ *
+ * \return True if --user-allow was not given, or if uid matches an element of
+ * the whitelist.
+ */
+bool uid_is_whitelisted(uid_t uid)
+{
+	int i;
+
+	if (!conf.user_allow_given)
+		return true;
+	for (i = 0; i < conf.user_allow_given; i++)
+		if (uid == uid_whitelist[i])
+			return true;
+	return false;
+}
+
 /**
  * the main function of para_audiod
  *
@@ -1475,8 +1507,11 @@ int main(int argc, char *argv[])
 	daemon_set_priority(conf.priority_arg);
 	daemon_drop_privileges_or_die(conf.user_arg, conf.group_arg);
 	parse_config_or_die();
-	daemon_init_colors_or_die(conf.color_arg, color_arg_auto, color_arg_no,
-		conf.logfile_given, conf.log_color_arg, conf.log_color_given);
+	if (daemon_init_colors_or_die(conf.color_arg, color_arg_auto, color_arg_no,
+		conf.logfile_given)) {
+			for (i = 0; i < conf.log_color_given; i++)
+				daemon_set_log_color_or_die(conf.log_color_arg[i]);
+	}
 	init_random_seed_or_die();
 	daemon_set_flag(DF_LOG_TIME);
 	daemon_set_flag(DF_LOG_HOSTNAME);