X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=c9400e9cdcdde5dfa9ec9cdcf0f0b27bbd09a4f8;hp=7da05898b69b528563fc0e902f0568c0728752a8;hb=f645b538c8f3dd88ce9a9ad5dbeb6cf341ad74ab;hpb=b17c70f1f96ca624064dd5202c54be55ed4d71c6

diff --git a/server.c b/server.c
index 7da05898..c9400e9c 100644
--- a/server.c
+++ b/server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -12,8 +12,9 @@
  *
  * Starting points for getting an overview:
  *
+ *
  * 	- The main programs: \ref server.c, \ref audiod.c, \ref client.c,
- *	  \ref audioc.c, \ref fsck.c,
+ *	  \ref audioc.c, \ref fsck.c, \ref afh.c
  *	- Server: \ref server_command, \ref sender,
  *	- Audio file selector: \ref audio_format_handler, \ref mood, \ref afs_table,
  *	- Client: \ref receiver, \ref receiver_node, \ref filter, \ref filter_node.
@@ -21,12 +22,12 @@
  *
  * The gory details, listed by topic:
  *
- * 	- Audio format handlers: \ref mp3_afh.c, \ref ogg_afh.c, \ref aac_afh.c,
- * 	- Decoders: \ref mp3dec.c, \ref oggdec.c, \ref aacdec.c,
- *	- Volume normalizer: \ref compress.c,
+ * 	- Audio format handlers: \ref send_common.c \ref mp3_afh.c, \ref ogg_afh.c, \ref aac_afh.c,
+ * 	- Decoders: \ref mp3dec_filter.c, \ref oggdec_filter.c, \ref aacdec_filter.c,
+ *	- Volume normalizer: \ref compress_filter.c,
  *	- Output: \ref alsa_write.c, \ref osx_write.c,
  * 	- http: \ref http_recv.c, \ref http_send.c,
- *	- ortp: \ref ortp_recv.c, \ref ortp_send.c,
+ *	- udp: \ref udp_recv.c, \ref udp_send.c,
  *	- dccp: \ref dccp_recv.c, \ref dccp_send.c,
  *	- Audio file selector: \ref afs.c, \ref aft.c, \ref mood.c,
  *	- Afs structures: \ref afs_table, \ref audio_file_data,
@@ -63,6 +64,7 @@
 
 #include <signal.h>
 #include <dirent.h>
+#include <sys/time.h>
 
 #include "para.h"
 #include "error.h"
@@ -135,7 +137,7 @@ struct server_command_task {
  * \param ll The log level.
  * \param fmt The format string describing the log message.
  */
-void para_log(int ll, const char* fmt,...)
+__printf_2_3 void para_log(int ll, const char* fmt,...)
 {
 	va_list argp;
 	FILE *outfd;
@@ -151,10 +153,10 @@ void para_log(int ll, const char* fmt,...)
 	tm = localtime(&t1);
 	strftime(str, MAXLINE, "%b %d %H:%M:%S", tm);
 	fprintf(outfd, "%s ", str);
-	if (conf.loglevel_arg <= INFO)
+	if (conf.loglevel_arg <= LL_INFO)
 		fprintf(outfd, "%i: ", ll);
 	mypid = getpid();
-	if (conf.loglevel_arg <= INFO)
+	if (conf.loglevel_arg <= LL_INFO)
 		fprintf(outfd, "(%d) ", (int)mypid);
 	va_start(argp, fmt);
 	vfprintf(outfd, fmt, argp);
@@ -164,7 +166,7 @@ void para_log(int ll, const char* fmt,...)
 /*
  * setup shared memory area and get mutex for locking
  */
-static void shm_init(void)
+static void init_ipc_or_die(void)
 {
 	void *shm;
 	int ret = shm_new(sizeof(struct misc_meta_data));
@@ -196,13 +198,23 @@ err_out:
 	exit(EXIT_FAILURE);
 }
 
-static void parse_config(int override)
+/**
+ * (Re-)read the server configuration files.
+ *
+ * \param override Passed to gengetopt to activate the override feature.
+ *
+ * This function also re-opens the logfile and sets the global \a
+ * user_list_file variable.
+ */
+void parse_config_or_die(int override)
 {
 	char *home = para_homedir();
 	struct stat statbuf;
 	int ret;
 	char *cf;
 
+	close_log(logfile);
+	logfile = NULL;
 	if (conf.config_file_given)
 		cf = para_strdup(conf.config_file_arg);
 	else
@@ -255,9 +267,7 @@ static void signal_pre_select(struct sched *s, struct task *t)
 static void handle_sighup(void)
 {
 	PARA_NOTICE_LOG("SIGHUP\n");
-	close_log(logfile); /* gets reopened if necessary by parse_config */
-	logfile = NULL;
-	parse_config(1); /* reopens log */
+	parse_config_or_die(1); /* reopens log */
 	init_user_list(user_list_file); /* reload user list */
 	if (mmd->afs_pid)
 		kill(mmd->afs_pid, SIGHUP);
@@ -480,11 +490,13 @@ static void server_init(int argc, char **argv)
 	/* parse command line options */
 	server_cmdline_parser_ext(argc, argv, &conf, &params);
 	HANDLE_VERSION_FLAG("server", conf);
-	para_drop_privileges(conf.user_arg, conf.group_arg);
+	drop_privileges_or_die(conf.user_arg, conf.group_arg);
 	/* parse config file, open log and set defaults */
-	parse_config(0);
+	parse_config_or_die(0);
 	log_welcome("para_server", conf.loglevel_arg);
-	shm_init(); /* init mmd struct */
+	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 */
 	init_user_list(user_list_file);
 	/* become daemon */
@@ -492,9 +504,9 @@ static void server_init(int argc, char **argv)
 		daemon_init();
 	PARA_NOTICE_LOG("initializing audio format handlers\n");
 	afh_init();
-	init_signal_task();
 	PARA_NOTICE_LOG("initializing the audio file selector\n");
 	afs_socket = init_afs();
+	init_signal_task();
 	PARA_NOTICE_LOG("initializing virtual streaming system\n");
 	init_vss_task(afs_socket);
 	init_server_command_task(argc, argv);