X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=e0d50f4f8689e1de283ef80f8341504bcf386d33;hp=076bf4fabbf2b0900e759d5cf4fb1427fa18bc99;hb=4fb6bf35f5dd6bfcafc0b90e83d4d9084da38365;hpb=799df0ceb9d496cb11a60ad130d664836df69823

diff --git a/server.c b/server.c
index 076bf4fa..e0d50f4f 100644
--- a/server.c
+++ b/server.c
@@ -41,10 +41,12 @@
 #include "server.lsg.h"
 #include "para.h"
 #include "error.h"
+#include "lsu.h"
 #include "crypt.h"
 #include "afh.h"
 #include "string.h"
 #include "afs.h"
+#include "net.h"
 #include "server.h"
 #include "list.h"
 #include "send.h"
@@ -52,7 +54,6 @@
 #include "vss.h"
 #include "config.h"
 #include "close_on_fork.h"
-#include "net.h"
 #include "daemon.h"
 #include "ipc.h"
 #include "fd.h"
@@ -129,8 +130,9 @@ bool process_is_command_handler(void)
 
 /** The task responsible for server command handling. */
 struct server_command_task {
-	/** TCP port on which para_server listens for connections. */
-	int listen_fd;
+	unsigned num_listen_fds; /* only one by default */
+	/** TCP socket(s) on which para_server listens for connections. */
+	int *listen_fds;
 	/* File descriptor for the accepted socket. */
 	int child_fd;
 	/** Copied from para_server's main function. */
@@ -214,56 +216,20 @@ err_out:
 void parse_config_or_die(bool reload)
 {
 	int ret;
-	char *cf = NULL, *errctx = NULL, *user_list_file = NULL;
-	void *map;
-	size_t sz;
-	int cf_argc;
-	char **cf_argv;
-	struct lls_parse_result *cf_lpr, *merged_lpr;
-	char *home = para_homedir();
-
-	if (OPT_GIVEN(CONFIG_FILE))
-		cf = para_strdup(OPT_STRING_VAL(CONFIG_FILE));
-	else
-		cf = make_message("%s/.paraslash/server.conf", home);
-	if (!mmd || getpid() != afs_pid) {
-		if (OPT_GIVEN(USER_LIST))
-			user_list_file = para_strdup(OPT_STRING_VAL(USER_LIST));
-		else
-			user_list_file = make_message("%s/.paraslash/server.users", home);
-	}
-	free(home);
-	ret = mmap_full_file(cf, O_RDONLY, &map, &sz, NULL);
-	if (ret < 0) {
-		if (ret != -E_EMPTY && ret != -ERRNO_TO_PARA_ERROR(ENOENT))
-			goto free_cf;
-		if (ret == -ERRNO_TO_PARA_ERROR(ENOENT) && OPT_GIVEN(CONFIG_FILE))
-			goto free_cf;
-		server_lpr = cmdline_lpr;
-		goto success;
-	}
-	ret = lls(lls_convert_config(map, sz, NULL, &cf_argv, &errctx));
-	para_munmap(map, sz);
-	if (ret < 0)
-		goto free_cf;
-	cf_argc = ret;
-	ret = lls(lls_parse(cf_argc, cf_argv, CMD_PTR, &cf_lpr, &errctx));
-	lls_free_argv(cf_argv);
-	if (ret < 0)
-		goto free_cf;
-	if (reload) /* config file overrides command line */
-		ret = lls(lls_merge(cf_lpr, cmdline_lpr, CMD_PTR, &merged_lpr,
-			&errctx));
-	else /* command line options override config file options */
-		ret = lls(lls_merge(cmdline_lpr, cf_lpr, CMD_PTR, &merged_lpr,
-			&errctx));
-	lls_free_parse_result(cf_lpr, CMD_PTR);
-	if (ret < 0)
-		goto free_cf;
+	unsigned flags = MCF_DONT_FREE;
+
 	if (server_lpr != cmdline_lpr)
 		lls_free_parse_result(server_lpr, CMD_PTR);
-	server_lpr = merged_lpr;
-success:
+	server_lpr = cmdline_lpr;
+	if (reload)
+		flags |= MCF_OVERRIDE;
+	ret = lsu_merge_config_file_options(OPT_STRING_VAL(CONFIG_FILE),
+		"server.conf", &server_lpr, CMD_PTR, server_suite, flags);
+	if (ret < 0) {
+		PARA_EMERG_LOG("failed to parse config file: %s\n",
+			para_strerror(-ret));
+		exit(EXIT_FAILURE);
+	}
 	daemon_set_loglevel(ENUM_STRING_VAL(LOGLEVEL));
 	if (OPT_GIVEN(LOGFILE)) {
 		daemon_set_logfile(OPT_STRING_VAL(LOGFILE));
@@ -282,19 +248,19 @@ success:
 	if (OPT_GIVEN(LOG_TIMING))
 		daemon_set_flag(DF_LOG_TIMING);
 	daemon_set_priority(OPT_UINT32_VAL(PRIORITY));
-	if (user_list_file)
+	if (!reload || getpid() != afs_pid) {
+		char *user_list_file;
+		if (OPT_GIVEN(USER_LIST))
+			user_list_file = para_strdup(OPT_STRING_VAL(USER_LIST));
+		else {
+			char *home = para_homedir();
+			user_list_file = make_message("%s/.paraslash/server.users", home);
+			free(home);
+		}
 		user_list_init(user_list_file);
-	ret = 1;
-free_cf:
-	free(cf);
-	free(user_list_file);
-	if (ret < 0) {
-		if (errctx)
-			PARA_ERROR_LOG("%s\n", errctx);
-		free(errctx);
-		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
-		exit(EXIT_FAILURE);
+		free(user_list_file);
 	}
+	return;
 }
 
 /*
@@ -382,22 +348,22 @@ static void init_signal_task(void)
 
 static void command_pre_select(struct sched *s, void *context)
 {
+	unsigned n;
 	struct server_command_task *sct = context;
-	para_fd_set(sct->listen_fd, &s->rfds, &s->max_fileno);
+
+	for (n = 0; n < sct->num_listen_fds; n++)
+		para_fd_set(sct->listen_fds[n], &s->rfds, &s->max_fileno);
 }
 
-static int command_post_select(struct sched *s, void *context)
+static int command_task_accept(unsigned listen_idx, struct sched *s,
+		struct server_command_task *sct)
 {
-	struct server_command_task *sct = context;
 	int new_fd, ret, i;
 	char *peer_name;
 	pid_t child_pid;
 	uint32_t *chunk_table;
 
-	ret = task_get_notification(sct->task);
-	if (ret < 0)
-		return ret;
-	ret = para_accept(sct->listen_fd, &s->rfds, NULL, 0, &new_fd);
+	ret = para_accept(sct->listen_fds[listen_idx], &s->rfds, NULL, 0, &new_fd);
 	if (ret <= 0)
 		goto out;
 	mmd->num_connects++;
@@ -459,29 +425,76 @@ out:
 	return 0;
 }
 
+static int command_post_select(struct sched *s, void *context)
+{
+	struct server_command_task *sct = context;
+	unsigned n;
+	int ret;
+
+	ret = task_get_notification(sct->task);
+	if (ret < 0)
+		return ret;
+	for (n = 0; n < sct->num_listen_fds; n++) {
+		ret = command_task_accept(n, s, sct);
+		if (ret < 0) {
+			free(sct->listen_fds);
+			return ret;
+		}
+	}
+	return 0;
+}
+
 static void init_server_command_task(struct server_command_task *sct,
 		int argc, char **argv)
 {
 	int ret;
+	unsigned n;
+	uint32_t port = OPT_UINT32_VAL(PORT);
 
 	PARA_NOTICE_LOG("initializing tcp command socket\n");
 	sct->child_fd = -1;
 	sct->argc = argc;
 	sct->argv = argv;
-	ret = para_listen_simple(IPPROTO_TCP, OPT_UINT32_VAL(PORT));
-	if (ret < 0)
-		goto err;
-	sct->listen_fd = ret;
-	ret = mark_fd_nonblocking(sct->listen_fd);
-	if (ret < 0)
-		goto err;
-	add_close_on_fork_list(sct->listen_fd); /* child doesn't need the listener */
+	if (!OPT_GIVEN(LISTEN_ADDRESS)) {
+		sct->num_listen_fds = 1;
+		sct->listen_fds = para_malloc(sizeof(int));
+		ret = para_listen_simple(IPPROTO_TCP, port);
+		if (ret < 0)
+			goto err;
+		sct->listen_fds[0] = ret;
+	} else {
+		sct->num_listen_fds = OPT_GIVEN(LISTEN_ADDRESS);
+		sct->listen_fds = para_malloc(sct->num_listen_fds * sizeof(int));
+		for (n = 0; n < OPT_GIVEN(LISTEN_ADDRESS); n++) {
+			const char *arg;
+			arg = lls_string_val(n, OPT_RESULT(LISTEN_ADDRESS));
+			ret = para_listen(IPPROTO_TCP, arg, port);
+			if (ret < 0)
+				goto err;
+			sct->listen_fds[n] = ret;
+		}
+	}
+	for (n = 0; n < sct->num_listen_fds; n++) {
+		ret = mark_fd_nonblocking(sct->listen_fds[n]);
+		if (ret < 0)
+			goto err;
+		/* child doesn't need the listener */
+		add_close_on_fork_list(sct->listen_fds[n]);
+	}
+
 	sct->task = task_register(&(struct task_info) {
 		.name = "server command",
 		.pre_select = command_pre_select,
 		.post_select = command_post_select,
 		.context = sct,
 	}, &sched);
+	/*
+	 * Detect whether the abstract Unix domain socket space is supported,
+	 * but do not create the socket. We check this once in server context
+	 * so that the command handlers inherit this bit of information and
+	 * don't need to check again.
+	 */
+	create_local_socket(NULL);
 	return;
 err:
 	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
@@ -505,6 +518,7 @@ static int init_afs(int argc, char **argv)
 		int i;
 
 		afs_pid = getpid();
+		crypt_shutdown();
 		user_list_deplete();
 		for (i = argc - 1; i >= 0; i--)
 			memset(argv[i], 0, strlen(argv[i]));
@@ -564,14 +578,11 @@ static void server_init(int argc, char **argv, struct server_command_task *sct)
 	if (OPT_GIVEN(DAEMON))
 		daemon_pipe = daemonize(true /* parent waits for SIGTERM */);
 	server_pid = getpid();
-	init_random_seed_or_die();
+	crypt_init();
 	daemon_log_welcome("server");
 	init_ipc_or_die(); /* init mmd struct, mmd and log mutex */
 	daemon_set_start_time();
 	daemon_set_hooks(pre_log_hook, post_log_hook);
-	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
@@ -684,12 +695,12 @@ int main(int argc, char *argv[])
 	 */
 	mutex_unlock(mmd_mutex);
 	sched_shutdown(&sched);
+	crypt_shutdown();
 	signal_shutdown(signal_task);
 	if (!process_is_command_handler()) { /* parent (server) */
 		mutex_destroy(mmd_mutex);
 		daemon_set_hooks(NULL, NULL); /* only one process remaining */
 		mutex_destroy(log_mutex);
-		shm_detach(mmd);
 		deplete_close_on_fork_list();
 		if (ret < 0)
 			PARA_EMERG_LOG("%s\n", para_strerror(-ret));