X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=13082e7832c627765c810d993e7714632f918f96;hp=2018b8eece1988206e2992f560b65fa73059ff5e;hb=c1d48060c104aecc99175155309ff2bca32494ca;hpb=767a4a54c967bc4b80bd14d02e89fe91acd848dd

diff --git a/server.c b/server.c
index 2018b8ee..13082e78 100644
--- a/server.c
+++ b/server.c
@@ -86,7 +86,15 @@ struct lls_parse_result *server_lpr = NULL;
 /* Command line options (no config file options). Used in handle_sighup(). */
 static struct lls_parse_result *cmdline_lpr;
 
-/** A random value used in child context for authentication. */
+/**
+ * A random number used to "authenticate" the afs connection.
+ *
+ * para_server picks this number by random before it forks the afs process. The
+ * command handlers know this number as well and write it to the afs socket,
+ * together with the id of the shared memory area which contains the payload of
+ * the afs command. A local process has to know this number to abuse the afs
+ * service provided by the local socket.
+ */
 uint32_t afs_socket_cookie;
 
 /** The mutex protecting the shared memory area containing the mmd struct. */
@@ -177,7 +185,6 @@ void parse_config_or_die(bool reload)
 	struct lls_parse_result *cf_lpr, *merged_lpr;
 	char *home = para_homedir();
 
-	daemon_close_log();
 	if (OPT_GIVEN(CONFIG_FILE))
 		cf = para_strdup(OPT_STRING_VAL(CONFIG_FILE));
 	else
@@ -403,11 +410,10 @@ out:
 	return 0;
 }
 
-static void init_server_command_task(int argc, char **argv)
+static void init_server_command_task(struct server_command_task *sct,
+		int argc, char **argv)
 {
 	int ret;
-	static struct server_command_task server_command_task_struct,
-		*sct = &server_command_task_struct;
 
 	PARA_NOTICE_LOG("initializing tcp command socket\n");
 	sct->argc = argc;
@@ -454,7 +460,7 @@ static int init_afs(int argc, char **argv)
 		i = argc - lls_num_inputs(cmdline_lpr) - 1;
 		sprintf(argv[i], "para_server (afs)");
 		close(afs_server_socket[0]);
-		afs_init(afs_socket_cookie, afs_server_socket[1]);
+		afs_init(afs_server_socket[1]);
 	}
 	close(afs_server_socket[1]);
 	if (read(afs_server_socket[0], &c, 1) <= 0) {
@@ -486,7 +492,7 @@ static void handle_help_flags(void)
 	exit(EXIT_SUCCESS);
 }
 
-static void server_init(int argc, char **argv)
+static void server_init(int argc, char **argv, struct server_command_task *sct)
 {
 	int ret, afs_socket, daemon_pipe = -1;
 	char *errctx;
@@ -532,7 +538,7 @@ static void server_init(int argc, char **argv)
 	para_unblock_signal(SIGCHLD);
 	PARA_NOTICE_LOG("initializing virtual streaming system\n");
 	vss_init(afs_socket, &sched);
-	init_server_command_task(argc, argv);
+	init_server_command_task(sct, argc, argv);
 	if (daemon_pipe >= 0) {
 		if (write(daemon_pipe, "\0", 1) < 0) {
 			PARA_EMERG_LOG("daemon_pipe: %s", strerror(errno));
@@ -595,11 +601,13 @@ static int server_select(int max_fileno, fd_set *readfds, fd_set *writefds,
 int main(int argc, char *argv[])
 {
 	int ret;
+	struct server_command_task server_command_task_struct,
+		*sct = &server_command_task_struct;
 
 	sched.default_timeout.tv_sec = 1;
 	sched.select_function = server_select;
 
-	server_init(argc, argv);
+	server_init(argc, argv, sct);
 	mutex_lock(mmd_mutex);
 	ret = schedule(&sched);
 	sched_shutdown(&sched);