X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=79e67818c87a1573b312c00091c8199f41c286ed;hp=4822ebb5c3066404e46f72b8154acc6f452bde04;hb=3781a3df94ce9bb28c98369df7a140fb4c086c23;hpb=3cfb1d880ebf22546486316cb74cce21f007eb07

diff --git a/server.c b/server.c
index 4822ebb5..79e67818 100644
--- a/server.c
+++ b/server.c
@@ -115,7 +115,6 @@ int mmd_mutex;
 
 /** The file containing user information (public key, permissions). */
 static char *user_list_file = NULL;
-static int mmd_shm_id;
 
 
 /** The task responsible for server command handling. */
@@ -162,16 +161,16 @@ static void init_colors_or_die(void)
 static void init_ipc_or_die(void)
 {
 	void *shm;
-	int ret = shm_new(sizeof(struct misc_meta_data));
+	int shmid, ret = shm_new(sizeof(struct misc_meta_data));
 
 	if (ret < 0)
 		goto err_out;
-
-	ret = shm_attach(ret, ATTACH_RW, &shm);
+	shmid = ret;
+	ret = shm_attach(shmid, ATTACH_RW, &shm);
+	shm_destroy(shmid);
 	if (ret < 0)
 		goto err_out;
 	mmd = shm;
-	mmd_shm_id = ret;
 
 	ret = mutex_new();
 	if (ret < 0)
@@ -228,7 +227,7 @@ void parse_config_or_die(int override)
 			.initialize = 0,
 			.check_required = 1,
 			.check_ambiguity = 0,
-			.print_errors = 1
+			.print_errors = !conf.daemon_given
 		};
 		server_cmdline_parser_config_file(cf, &conf, &params);
 		conf.daemon_given = tmp;
@@ -301,10 +300,11 @@ static void signal_post_select(struct sched *s, struct task *t)
 		PARA_EMERG_LOG("terminating on signal %d\n", st->signum);
 genocide:
 		kill(0, SIGTERM);
+		free(mmd->afd.afhi.chunk_table);
+		free(mmd->afd.afhi.info_string);
+		close_listed_fds();
 		mutex_destroy(mmd_mutex);
 		shm_detach(mmd);
-		shm_destroy(mmd_shm_id);
-
 		exit(EXIT_FAILURE);
 	}
 }
@@ -318,27 +318,15 @@ static void init_signal_task(void)
 	st->task.post_select = signal_post_select;
 	sprintf(st->task.status, "signal task");
 
+	PARA_NOTICE_LOG("setting up signal handling\n");
 	st->fd = para_signal_init(); /* always successful */
-
-	PARA_NOTICE_LOG("setting up signal handlers\n");
-	if (para_install_sighandler(SIGINT) < 0)
-		goto err;
-	if (para_install_sighandler(SIGTERM) < 0)
-		goto err;
-	if (para_install_sighandler(SIGHUP) < 0)
-		goto err;
-	if (para_install_sighandler(SIGCHLD) < 0)
-		goto err;
-	if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
-		goto err;
-	if (signal(SIGUSR1, SIG_IGN) == SIG_ERR)
-		goto err;
+	para_install_sighandler(SIGINT);
+	para_install_sighandler(SIGTERM);
+	para_install_sighandler(SIGHUP);
+	para_install_sighandler(SIGCHLD);
+	para_sigaction(SIGPIPE, SIG_IGN);
 	add_close_on_fork_list(st->fd);
 	register_task(&st->task);
-	return;
-err:
-	PARA_EMERG_LOG("could not install signal handlers\n");
-	exit(EXIT_FAILURE);
 }
 
 static void command_pre_select(struct sched *s, struct task *t)
@@ -472,6 +460,12 @@ static int init_afs(void)
 	return afs_server_socket[0];
 }
 
+__noreturn static void tmp_sigchld_handler(__a_unused int s)
+{
+	PARA_EMERG_LOG("caught early SIGCHLD\n");
+	exit(EXIT_FAILURE);
+}
+
 static void server_init(int argc, char **argv)
 {
 	struct server_cmdline_parser_params params = {
@@ -502,6 +496,21 @@ static void server_init(int argc, char **argv)
 		daemonize();
 	PARA_NOTICE_LOG("initializing audio format handlers\n");
 	afh_init();
+
+	/*
+	 * Although afs uses its own signal handling we must ignore SIGUSR1
+	 * _before_ the afs child process gets born by init_afs() below.  It's
+	 * racy to do this in the child because the parent might send SIGUSR1
+	 * before the child gets a chance to ignore this signal -- only the
+	 * good die young.
+	 */
+	para_sigaction(SIGUSR1, SIG_IGN);
+	/*
+	 * We have to install a SIGCHLD handler before the afs process is being
+	 * forked off. Otherwise, para_server does not notice if afs dies before
+	 * the SIGCHLD handler has been installed by init_signal_task() below.
+	 */
+	para_sigaction(SIGCHLD, tmp_sigchld_handler);
 	PARA_NOTICE_LOG("initializing the audio file selector\n");
 	afs_socket = init_afs();
 	init_signal_task();