X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=1e45eb3616a858091f98f42079d94251963a43ed;hp=849b707a43043a501ab92cadbed6af66f725a139;hb=a7a72ca4acf7f44abca866d410e2bc80590e7fab;hpb=b62e2796b85c7d7f3138fe729f4637853e0fafe0

diff --git a/server.c b/server.c
index 849b707a..1e45eb36 100644
--- a/server.c
+++ b/server.c
@@ -52,20 +52,19 @@
  *	- Blob tables: \ref blob.c,
  *	- The error subssystem: \ref error.h.
  *	- Access control for paraslash senders: \ref acl.c, \ref acl.h.
+ *	- Internal crypto API: \ref crypt.h.
  *
  * Low-level data structures:
  *
  *	- Doubly linked lists: \ref list.h,
  *	- Ring buffer: \ref ringbuffer.c, \ref ringbuffer.h,
- *	- Hashing: \ref hash.h, \ref sha1.h, \ref sha1.c,
- *	- Crypto: \ref crypt.c.
+ *	- openssl: \ref crypt.c
+ *	- libgcrypt: \ref gcrypt.c
  *	- Forward error correction: \ref fec.c.
  */
 
 #include <signal.h>
-#include <dirent.h>
 #include <sys/time.h>
-#include <openssl/rc4.h>
 #include <regex.h>
 #include <osl.h>
 #include <stdbool.h>
@@ -91,6 +90,7 @@
 #include "signal.h"
 #include "user_list.h"
 #include "color.h"
+#include "version.h"
 
 /** Define the array of error lists needed by para_server. */
 INIT_SERVER_ERRLISTS;
@@ -426,6 +426,7 @@ static void init_server_command_task(int argc, char **argv)
 	if (ret < 0)
 		goto err;
 	add_close_on_fork_list(sct->listen_fd); /* child doesn't need the listener */
+	sprintf(sct->task.status, "server command task");
 	register_task(&sct->task);
 	return;
 err:
@@ -461,12 +462,6 @@ 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 = {
@@ -490,8 +485,9 @@ static void server_init(int argc, char **argv)
 	init_ipc_or_die(); /* init mmd struct and mmd->lock */
 	/* make sure, the global now pointer is uptodate */
 	gettimeofday(now, NULL);
-	server_uptime(UPTIME_SET); /* reset server uptime */
+	set_server_start_time(now);
 	init_user_list(user_list_file);
+	init_server_command_task(argc, argv);
 	/* become daemon */
 	if (conf.daemon_given)
 		daemonize();
@@ -507,24 +503,25 @@ static void server_init(int argc, char **argv)
 	 */
 	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.
+	 * We have to block SIGCHLD before the afs process is being forked off.
+	 * Otherwise, para_server does not notice if afs dies before the
+	 * SIGCHLD handler has been installed for the parent process by
+	 * init_signal_task() below.
 	 */
-	para_sigaction(SIGCHLD, tmp_sigchld_handler);
+	para_block_signal(SIGCHLD);
 	PARA_NOTICE_LOG("initializing the audio file selector\n");
 	afs_socket = init_afs();
 	init_signal_task();
+	para_unblock_signal(SIGCHLD);
 	PARA_NOTICE_LOG("initializing virtual streaming system\n");
 	init_vss_task(afs_socket);
-	init_server_command_task(argc, argv);
 	PARA_NOTICE_LOG("server init complete\n");
 }
 
 static void status_refresh(void)
 {
 	static int prev_uptime = -1, prev_events = -1;
-	int uptime = server_uptime(UPTIME_GET), ret = 1;
+	int uptime = get_server_uptime(now);
 
 	if (prev_events != mmd->events)
 		goto out;
@@ -539,11 +536,8 @@ out:
 	prev_uptime = uptime;
 	prev_events = mmd->events;
 	mmd->vss_status_flags = mmd->new_vss_status_flags;
-	if (ret) {
-		PARA_DEBUG_LOG("%d events, forcing status update\n",
-			mmd->events);
-		killpg(0, SIGUSR1);
-	}
+	PARA_DEBUG_LOG("%d events, forcing status update\n", mmd->events);
+	killpg(0, SIGUSR1);
 }
 
 static int server_select(int max_fileno, fd_set *readfds, fd_set *writefds,