X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=a5ae0268cfde442345cd2c0993f6a95ce07f1c2a;hp=d48a0c91e391e7238c551602dacc56a0f378899b;hb=94fa6ad6ec3068227d322cb83186ff8780100107;hpb=ff5830c9fc83ee59be9351c7ff45c1e376bac22b;ds=sidebyside

diff --git a/server.c b/server.c
index d48a0c91..a5ae0268 100644
--- a/server.c
+++ b/server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -51,6 +51,7 @@
  *	- The object storage layer: \ref osl.c,
  *	- Blob tables: \ref blob.c,
  *	- The error subssystem: \ref error.h.
+ *	- Access control for paraslash senders: \ref acl.c, \ref acl.h.
  *
  * Low-level data structures:
  *
@@ -76,12 +77,12 @@
 #include "vss.h"
 #include "config.h"
 #include "close_on_fork.h"
+#include "list.h"
 #include "send.h"
 #include "net.h"
 #include "daemon.h"
 #include "ipc.h"
 #include "fd.h"
-#include "list.h"
 #include "sched.h"
 #include "signal.h"
 #include "user_list.h"
@@ -204,7 +205,7 @@ static void shm_init(void)
 	mmd->sender_cmd_data.cmd_num = -1;
 	return;
 err_out:
-	PARA_EMERG_LOG("%s", PARA_STRERROR(-ret));
+	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 	exit(EXIT_FAILURE);
 }
 
@@ -265,7 +266,7 @@ static void parse_config(int override)
 	/* logfile */
 	if (!conf.logfile_given && conf.daemon_given) {
 		ret = -1;
-		PARA_EMERG_LOG("%s", "daemon, but no log file\n");
+		PARA_EMERG_LOG("fatal: daemon option, but no log file given\n");
 		goto out;
 	}
 	if (conf.logfile_given)
@@ -283,22 +284,26 @@ out:
 
 static void setup_signal_handling(void)
 {
-	int ret = 0;
-
-	signal_pipe = para_signal_init();
+	signal_pipe = para_signal_init(); /* always successful */
 
 	PARA_NOTICE_LOG("setting up signal handlers\n");
-	ret += para_install_sighandler(SIGINT);
-	ret += para_install_sighandler(SIGTERM);
-	ret += para_install_sighandler(SIGHUP);
-	ret += para_install_sighandler(SIGCHLD);
-	ret += para_install_sighandler(SIGUSR1);
-	signal(SIGPIPE, SIG_IGN);
-	if (ret != 5) {
-		PARA_EMERG_LOG("%s", "could not install signal handlers\n");
-		exit(EXIT_FAILURE);
-	}
+	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;
 	add_close_on_fork_list(signal_pipe);
+	return;
+err:
+	PARA_EMERG_LOG("could not install signal handlers\n");
+	exit(EXIT_FAILURE);
 }
 
 static unsigned init_network(void)
@@ -314,31 +319,36 @@ static unsigned init_network(void)
 	add_close_on_fork_list(fd); /* child doesn't need the listener */
 	return fd;
 err:
-	PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 	exit(EXIT_FAILURE);
 }
 
 static void init_random_seed(void)
 {
-	int fd, ret = -1;
 	unsigned int seed;
-	size_t len = sizeof(unsigned int);
+	int fd, ret = para_open("/dev/urandom", O_RDONLY, 0);
 
-	fd = open("/dev/urandom", O_RDONLY);
-	if (fd < 0)
+	if (ret < 0)
+		goto err;
+	fd = ret;
+	ret = read(fd, &seed, sizeof(seed));
+	if (ret < 0) {
+		ret = -ERRNO_TO_PARA_ERROR(errno);
 		goto out;
-	ret = -2;
-	if (read(fd, &seed, len) != len)
+	}
+	if (ret != sizeof(seed)) {
+		ret = -ERRNO_TO_PARA_ERROR(EIO);
 		goto out;
+	}
 	srandom(seed);
 	ret = 1;
 out:
-	if (fd >= 0)
-		close(fd);
-	if (ret > 0)
+	close(fd);
+	if (ret >= 0)
 		return;
-	PARA_EMERG_LOG("can not seed pseudo random generator (ret = %d)\n",
-		ret);
+err:
+	PARA_EMERG_LOG("can not seed pseudo random number generator: %s\n",
+		para_strerror(-ret));
 	exit(EXIT_FAILURE);
 }
 
@@ -371,7 +381,6 @@ static void init_afs(void)
 		(unsigned) afs_socket_cookie);
 }
 
-
 static unsigned server_init(int argc, char **argv)
 {
 	/* connector's address information */
@@ -394,11 +403,11 @@ static unsigned server_init(int argc, char **argv)
 	PARA_NOTICE_LOG("initializing audio format handlers\n");
 	afh_init();
 	PARA_NOTICE_LOG("initializing virtual streaming system\n");
-	vss_init();
 	mmd->server_pid = getpid();
 	setup_signal_handling();
 	PARA_NOTICE_LOG("initializing the audio file selector\n");
 	init_afs();
+	vss_init();
 	mmd_lock();
 	/* init network socket */
 	PARA_NOTICE_LOG("initializing tcp command socket\n");
@@ -412,7 +421,7 @@ static unsigned server_init(int argc, char **argv)
  */
 static void handle_sighup(void)
 {
-	PARA_NOTICE_LOG("%s", "SIGHUP\n");
+	PARA_NOTICE_LOG("SIGHUP\n");
 	close_log(logfile); /* gets reopened if necessary by parse_config */
 	logfile = NULL;
 	parse_config(1); /* reopens log */
@@ -475,8 +484,6 @@ repeat:
 	timeout = vss_preselect(&rfds, &wfds, &max_fileno);
 	status_refresh();
 	for (i = 0; senders[i].name; i++) {
-		if (senders[i].status != SENDER_ON)
-			continue;
 		if (!senders[i].pre_select)
 			continue;
 		senders[i].pre_select(&max_fileno, &rfds, &wfds);
@@ -488,8 +495,6 @@ repeat:
 	if (ret < 0)
 		goto repeat;
 	for (i = 0; senders[i].name; i++) {
-		if (senders[i].status != SENDER_ON)
-			continue;
 		if (!senders[i].post_select)
 			continue;
 		senders[i].post_select(&rfds, &wfds);
@@ -549,7 +554,7 @@ genocide:
 	random();
 	chld_pid = fork();
 	if (chld_pid < 0) {
-		PARA_CRIT_LOG("%s", "fork failed\n");
+		PARA_CRIT_LOG("fork failed\n");
 		goto repeat;
 	}
 	if (chld_pid) {