X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=6b1e11d6fb580b1edd8da144e3c47b2977fb1d2e;hp=0e256053e81f531a2cb178fd57f45ff935b437e6;hb=7a4b6d5f19976ceac581f6dc235fcbd9b30c767f;hpb=fd652c08d4b5b26032646c449e1979c48018b70a

diff --git a/server.c b/server.c
index 0e256053..6b1e11d6 100644
--- a/server.c
+++ b/server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -23,9 +23,9 @@
  * The gory details, listed by topic:
  *
  * 	- Audio format handlers: \ref send_common.c \ref mp3_afh.c,
- *	  \ref ogg_afh.c, \ref aac_afh.c, \ref wma_afh.c,
+ *	  \ref ogg_afh.c, \ref aac_afh.c, \ref wma_afh.c, \ref spx_afh.c
  * 	- Decoders: \ref mp3dec_filter.c, \ref oggdec_filter.c,
- *	  \ref aacdec_filter.c, \ref wmadec_filter.c,
+ *	  \ref aacdec_filter.c, \ref wmadec_filter.c, spxdec_filter.c,
  *	- Volume normalizer: \ref compress_filter.c,
  *	- Output: \ref alsa_write.c, \ref osx_write.c, \ref oss_write.c,
  * 	- http: \ref http_recv.c, \ref http_send.c,
@@ -52,22 +52,22 @@
  *	- 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>
 
 #include "para.h"
 #include "error.h"
@@ -90,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;
@@ -146,17 +147,14 @@ static int want_colors(void)
 
 static void init_colors_or_die(void)
 {
-	int ret, i;
+	int i;
 
 	if (!want_colors())
 		return;
 	daemon_set_flag(DF_COLOR_LOG);
 	daemon_set_default_log_colors();
-	for (i = 0; i < conf.log_color_given; i++) {
-		ret = daemon_set_log_color(conf.log_color_arg[i]);
-		if (ret < 0)
-			exit(EXIT_FAILURE);
-	}
+	for (i = 0; i < conf.log_color_given; i++)
+		daemon_set_log_color_or_die(conf.log_color_arg[i]);
 }
 
 /*
@@ -428,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:
@@ -492,8 +491,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();
@@ -519,14 +519,13 @@ static void server_init(int argc, char **argv)
 	init_signal_task();
 	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;
@@ -541,11 +540,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,