/*
- * 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.
*/
* 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,
- * - Decoders: \ref mp3dec.c, \ref oggdec.c, \ref aacdec.c,
- * - Volume normalizer: \ref compress.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,
#include <signal.h>
#include <dirent.h>
+#include <sys/time.h>
#include "para.h"
#include "error.h"
* \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;
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);
/*
* 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));
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
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);
/* parse command line options */
server_cmdline_parser_ext(argc, argv, &conf, ¶ms);
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 */
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);