X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=9b79121b3aa16f51662b9e7e2649e097f81b5a26;hp=dbc1e850c2f615e3775d06fe62441274ff470bd3;hb=d6dcce32b8e844b7a2ffeb5ff2e519e89fb7be3f;hpb=566fce2b157e3cd134b35afc243472955423ea2c

diff --git a/audiod.c b/audiod.c
index dbc1e850..9b79121b 100644
--- a/audiod.c
+++ b/audiod.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file audiod.c the paraslash's audio daemon */
@@ -180,14 +168,14 @@ void para_log(int ll, const char* fmt,...)
 
 static char *configfile_exists(void)
 {
-	static char *config_file;
-
-	if (!config_file) {
-		char *home = para_homedir();
-		config_file = make_message("%s/.paraslash/audiod.conf", home);
-		free(home);
-	}
-	return file_exists(config_file)? config_file : NULL;
+	char *home = para_homedir();
+	char *config_file = make_message("%s/.paraslash/audiod.conf",
+		home);
+	free(home);
+	if (file_exists(config_file))
+		return config_file;
+	free(config_file);
+	return NULL;
 }
 
 static void setup_signal_handling(void)
@@ -636,7 +624,7 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
 			s->timeout = min_delay;
 			continue;
 		}
-		PARA_INFO_LOG("inital delay: %lu ms left\n", tv2ms(&diff));
+		PARA_INFO_LOG("initial delay: %lu ms left\n", tv2ms(&diff));
 		if (tv_diff(&s->timeout, &diff, NULL) > 0) {
 			s->timeout = diff;
 		}
@@ -878,14 +866,14 @@ static int audiod_get_socket(void)
 	PARA_NOTICE_LOG("local socket: %s\n", socket_name);
 	if (conf.force_given)
 		unlink(socket_name);
-	fd = create_pf_socket(socket_name, &unix_addr,
+	fd = create_local_socket(socket_name, &unix_addr,
 			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
 	if (fd < 0) {
-		PARA_EMERG_LOG("%s", "can not connect to socket\n");
+		PARA_EMERG_LOG("can not connect to socket\n");
 		exit(EXIT_FAILURE); /* do not unlink socket */
 	}
 	if (listen(fd , 5) < 0) {
-		PARA_EMERG_LOG("%s", "can not listen on socket\n");
+		PARA_EMERG_LOG("can not listen on socket\n");
 		exit(EXIT_FAILURE); /* do not unlink socket */
 	}
 	mark_fd_nonblock(fd);
@@ -1011,11 +999,16 @@ void __noreturn clean_exit(int status, const char *msg)
 	exit(status);
 }
 
+/* avoid busy loop if server is down */
+static void set_stat_task_restart_barrier(void)
+{
+	struct timeval delay = {5, 0};
+	tv_add(now, &delay, &stat_task->restart_barrier);
+}
 
 static void client_task_event_handler(__a_unused struct task *t)
 {
 	int i;
-	struct timeval delay = {1, 0};
 
 	if (t->ret == -E_HANDSHAKE_COMPLETE)
 		return;
@@ -1023,8 +1016,7 @@ static void client_task_event_handler(__a_unused struct task *t)
 	close_stat_pipe();
 	if (t->ret != -E_SERVER_EOF)
 		stat_task->clock_diff_count = conf.clock_diff_count_arg;
-	/* avoid busy loop if server is down */
-	tv_add(now, &delay, &stat_task->restart_barrier);
+	set_stat_task_restart_barrier();
 	FOR_EACH_AUDIO_FORMAT(i)
 		afi[i].restart_barrier = stat_task->restart_barrier;
 }
@@ -1053,6 +1045,7 @@ static void status_pre_select(struct sched *s, struct task *t)
 		int argc = 2;
 		ret = client_open(argc, argv, &st->pcd);
 	}
+	set_stat_task_restart_barrier();
 	if (ret < 0)
 		return;
 	st->pcd->task.event_handler = client_task_event_handler;
@@ -1127,7 +1120,7 @@ static void set_initial_status(void)
  * */
 int main(int argc, char *argv[])
 {
-	char *cf;
+	char *config_file;
 	int ret, i;
 	struct sched s;
 	struct command_task command_task_struct, *cmd_task = &command_task_struct;
@@ -1137,12 +1130,20 @@ int main(int argc, char *argv[])
 	audiod_cmdline_parser(argc, argv, &conf);
 	HANDLE_VERSION_FLAG("audiod", conf);
 	para_drop_privileges(conf.user_arg, conf.group_arg);
-	cf = configfile_exists();
-	if (cf) {
-		if (audiod_cmdline_parser_configfile(cf, &conf, 0, 0, 0)) {
+	config_file = configfile_exists();
+	if (config_file) {
+		struct audiod_cmdline_parser_params params = {
+			.override = 0,
+			.initialize = 0,
+			.check_required = 0,
+			.check_ambiguity = 0
+
+		};
+		if (audiod_cmdline_parser_config_file(config_file, &conf, &params)) {
 			PARA_EMERG_LOG("%s", "parse error in config file\n");
 			exit(EXIT_FAILURE);
 		}
+		free(config_file);
 	}
 	if (conf.logfile_given)
 		logfile = open_log(conf.logfile_arg);