X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=66c93ab259d1c26e26a904c312cd45916407cb2a;hp=c5f9ede61a92be19c4a8580b0eaf01ca4bf4e319;hb=ebbea4043aa7c7f200e4f56c3bfa42f5c31f2e03;hpb=fe3d9cd155b5eac8706015854c343440823e12da

diff --git a/server.c b/server.c
index c5f9ede6..66c93ab2 100644
--- a/server.c
+++ b/server.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file server.c Paraslash's main server. */
 
@@ -49,6 +45,7 @@
 #include "afh.h"
 #include "string.h"
 #include "afs.h"
+#include "net.h"
 #include "server.h"
 #include "list.h"
 #include "send.h"
@@ -56,7 +53,6 @@
 #include "vss.h"
 #include "config.h"
 #include "close_on_fork.h"
-#include "net.h"
 #include "daemon.h"
 #include "ipc.h"
 #include "fd.h"
@@ -90,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. */
@@ -99,6 +103,9 @@ int mmd_mutex;
 static struct sched sched;
 static struct signal_task *signal_task;
 
+/** The process id of the audio file selector process. */
+pid_t afs_pid = 0;
+
 /** The task responsible for server command handling. */
 struct server_command_task {
 	/** TCP port on which para_server listens for connections. */
@@ -178,12 +185,11 @@ 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
 		cf = make_message("%s/.paraslash/server.conf", home);
-	if (!mmd || getpid() != mmd->afs_pid) {
+	if (!mmd || getpid() != afs_pid) {
 		if (OPT_GIVEN(USER_LIST))
 			user_list_file = para_strdup(OPT_STRING_VAL(USER_LIST));
 		else
@@ -262,8 +268,8 @@ static void handle_sighup(void)
 
 	PARA_NOTICE_LOG("SIGHUP\n");
 	parse_config_or_die(true);
-	if (mmd->afs_pid)
-		kill(mmd->afs_pid, SIGHUP);
+	if (afs_pid != 0)
+		kill(afs_pid, SIGHUP);
 }
 
 static int signal_post_select(struct sched *s, __a_unused void *context)
@@ -282,7 +288,7 @@ static int signal_post_select(struct sched *s, __a_unused void *context)
 			int ret = para_reap_child(&pid);
 			if (ret <= 0)
 				break;
-			if (pid != mmd->afs_pid)
+			if (pid != afs_pid)
 				continue;
 			PARA_EMERG_LOG("fatal: afs died\n");
 			kill(0, SIGTERM);
@@ -308,8 +314,8 @@ static int signal_post_select(struct sched *s, __a_unused void *context)
 		 * processes get killed immediately by the above kill().
 		 */
 		PARA_INFO_LOG("waiting for afs (pid %d) to die\n",
-			(int)mmd->afs_pid);
-		waitpid(mmd->afs_pid, NULL, 0);
+			(int)afs_pid);
+		waitpid(afs_pid, NULL, 0);
 cleanup:
 		free(mmd->afd.afhi.chunk_table);
 		close_listed_fds();
@@ -396,7 +402,7 @@ static int command_post_select(struct sched *s, void *context)
 		memset(sct->argv[i], 0, strlen(sct->argv[i]));
 	i = sct->argc - 1 - lls_num_inputs(cmdline_lpr);
 	sprintf(sct->argv[i], "para_server (serving %s)", peer_name);
-	handle_connect(new_fd, peer_name);
+	handle_connect(new_fd);
 	/* never reached*/
 out:
 	if (ret < 0)
@@ -436,7 +442,6 @@ err:
 static int init_afs(int argc, char **argv)
 {
 	int ret, afs_server_socket[2];
-	pid_t afs_pid;
 	char c;
 
 	ret = socketpair(PF_UNIX, SOCK_STREAM, 0, afs_server_socket);
@@ -450,14 +455,14 @@ static int init_afs(int argc, char **argv)
 	if (afs_pid == 0) { /* child (afs) */
 		int i;
 
+		afs_pid = getpid();
 		for (i = argc - 1; i >= 0; i--)
 			memset(argv[i], 0, strlen(argv[i]));
 		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]);
 	}
-	mmd->afs_pid = afs_pid;
 	close(afs_server_socket[1]);
 	if (read(afs_server_socket[0], &c, 1) <= 0) {
 		PARA_EMERG_LOG("early afs exit\n");