X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=8f246ba53a04bad687af14d428bec276c822f001;hp=e8a82b5ed254d447b8edc106e0c6f98d2a64d2f7;hb=f189411b9986564c2652ef87e54189e5fa0d5d11;hpb=00e95557839f3fef5fa06702f3864e8376d2a29b

diff --git a/audiod.c b/audiod.c
index e8a82b5e..8f246ba5 100644
--- a/audiod.c
+++ b/audiod.c
@@ -144,7 +144,7 @@ struct audiod_args_info conf;
 static char *socket_name;
 static struct audio_format_info afi[NUM_AUDIO_FORMATS];
 
-static struct signal_task signal_task_struct, *sig_task = &signal_task_struct;
+static struct signal_task *signal_task;
 
 static struct status_task status_task_struct;
 
@@ -155,14 +155,22 @@ static struct status_task status_task_struct;
  */
 static struct status_task *stat_task = &status_task_struct;
 
-/**
- * the task for handling audiod commands
+/*
+ * The task for handling audiod commands.
  *
- * \sa struct task, struct sched
+ * We need two listening sockets for backward compability: on Linux systems
+ * fd[0] is an abstract socket (more precisely, a socket bound to an address in
+ * the abstract namespace), and fd[1] is the usual pathname socket. On other
+ * systems, fd[0] is negative, and only the pathname socket is used.
+ *
+ * For 0.5.x we accept connections on both sockets to make sure that old
+ * para_audioc versions can still connect. New versions use only the abstract
+ * socket. Hence after v0.6.0 we can go back to a single socket, either an
+ * abstract one (Linux) or a pathname socket (all other systems).
  */
 struct command_task {
-	/** the local listening socket */
-	int fd;
+	/** The local listening sockets. */
+	int fd[2];
 	/** the associated task structure */
 	struct task *task;
 };
@@ -347,8 +355,7 @@ err:
 
 static void setup_signal_handling(void)
 {
-	sig_task->fd = para_signal_init();
-	PARA_INFO_LOG("signal pipe: fd %d\n", sig_task->fd);
+	signal_task = signal_init_or_die();
 	para_install_sighandler(SIGINT);
 	para_install_sighandler(SIGTERM);
 	para_install_sighandler(SIGHUP);
@@ -956,10 +963,8 @@ static int parse_stream_args(void)
 }
 
 /* does not unlink socket on errors */
-static int audiod_get_socket(void)
+static void init_local_sockets(struct command_task *ct)
 {
-	int ret;
-
 	if (conf.socket_given)
 		socket_name = para_strdup(conf.socket_arg);
 	else {
@@ -971,22 +976,15 @@ static int audiod_get_socket(void)
 	PARA_NOTICE_LOG("local socket: %s\n", socket_name);
 	if (conf.force_given)
 		unlink(socket_name);
-	ret = create_local_socket(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);
-	if (ret < 0)
-		goto err;
-	return ret;
-err:
-	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+	if (ct->fd[0] >= 0 || ct->fd[1] >= 0)
+		return;
+	PARA_EMERG_LOG("%s\n", para_strerror(-ct->fd[1]));
 	exit(EXIT_FAILURE);
 }
 
-static void signal_pre_select(struct sched *s, void *context)
-{
-	struct signal_task *st = context;
-	para_fd_set(st->fd, &s->rfds, &s->max_fileno);
-}
-
 static int signal_post_select(struct sched *s, void *context)
 {
 	struct signal_task *st = context;
@@ -1010,28 +1008,38 @@ static int signal_post_select(struct sched *s, void *context)
 static void command_pre_select(struct sched *s, void *context)
 {
 	struct command_task *ct = context;
-	para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
+	int i;
+
+	for (i = 0; i < 2; i++)
+		if (ct->fd[i] >= 0)
+			para_fd_set(ct->fd[i], &s->rfds, &s->max_fileno);
 }
 
 static int command_post_select(struct sched *s, void *context)
 {
-	int ret;
+	int ret, i;
 	struct command_task *ct = context;
 	static struct timeval last_status_dump;
 	struct timeval tmp, delay;
-	bool force = true;
+	bool force = false;
 
 	ret = task_get_notification(ct->task);
 	if (ret < 0)
 		return ret;
-	ret = handle_connect(ct->fd, &s->rfds);
-	if (ret < 0) {
-		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
-		if (ret == -E_AUDIOD_TERM) {
-			task_notify_all(s, -ret);
-			return ret;
-		}
-	} else if (ret > 0)
+	for (i = 0; i < 2; i++) {
+		if (ct->fd[i] < 0)
+			continue;
+		ret = handle_connect(ct->fd[i], &s->rfds);
+		if (ret < 0) {
+			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+			if (ret == -E_AUDIOD_TERM) {
+				task_notify_all(s, -ret);
+				return ret;
+			}
+		} else if (ret > 0)
+			force = true;
+	}
+	if (force == true)
 		goto dump;
 
 	/* if last status dump was less than 500ms ago, do nothing */
@@ -1048,8 +1056,8 @@ static int command_post_select(struct sched *s, void *context)
 	delay.tv_sec = 5;
 	delay.tv_usec = 0;
 	tv_add(&last_status_dump, &delay, &tmp);
-	if (tv_diff(now, &tmp, NULL) < 0)
-		force = false;
+	if (tv_diff(now, &tmp, NULL) > 0)
+		force = true;
 dump:
 	audiod_status_dump(force);
 	last_status_dump = *now;
@@ -1058,7 +1066,7 @@ dump:
 
 static void init_command_task(struct command_task *ct)
 {
-	ct->fd = audiod_get_socket(); /* doesn't return on errors */
+	init_local_sockets(ct); /* doesn't return on errors */
 
 	ct->task = task_register(&(struct task_info) {
 		.name = "command",
@@ -1403,11 +1411,11 @@ int main(int argc, char *argv[])
 	if (conf.daemon_given)
 		daemonize(false /* parent exits immediately */);
 
-	sig_task->task = task_register(&(struct task_info) {
+	signal_task->task = task_register(&(struct task_info) {
 		.name = "signal",
 		.pre_select = signal_pre_select,
 		.post_select = signal_post_select,
-		.context = sig_task,
+		.context = signal_task,
 	}, &sched);
 
 	sched.default_timeout.tv_sec = 2;
@@ -1415,6 +1423,7 @@ int main(int argc, char *argv[])
 	ret = schedule(&sched);
 	audiod_cleanup();
 	sched_shutdown(&sched);
+	signal_shutdown(signal_task);
 
 	if (ret < 0)
 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));