/*
- * Copyright (C) 1997-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2012 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include <sys/time.h>
#include <regex.h>
#include <osl.h>
-#include <stdbool.h>
#include "para.h"
#include "error.h"
#include "server.h"
#include "list.h"
#include "send.h"
+#include "sched.h"
#include "vss.h"
#include "config.h"
#include "close_on_fork.h"
#include "daemon.h"
#include "ipc.h"
#include "fd.h"
-#include "sched.h"
#include "signal.h"
#include "user_list.h"
#include "color.h"
#include "version.h"
+__printf_2_3 void (*para_log)(int, const char*, ...) = daemon_log;
+
/** Define the array of error lists needed by para_server. */
INIT_SERVER_ERRLISTS;
/** The file containing user information (public key, permissions). */
static char *user_list_file = NULL;
+static struct sched sched;
/** The task responsible for server command handling. */
struct server_command_task {
para_install_sighandler(SIGCHLD);
para_sigaction(SIGPIPE, SIG_IGN);
add_close_on_fork_list(st->fd);
- register_task(&st->task);
+ register_task(&sched, &st->task);
}
static void command_pre_select(struct sched *s, struct task *t)
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);
+ register_task(&sched, &sct->task);
return;
err:
PARA_EMERG_LOG("%s\n", para_strerror(-ret));
gettimeofday(now, NULL);
set_server_start_time(now);
init_user_list(user_list_file);
- init_server_command_task(argc, argv);
/* become daemon */
if (conf.daemon_given)
- daemonize();
+ daemonize(true /* parent waits for SIGTERM */);
PARA_NOTICE_LOG("initializing audio format handlers\n");
afh_init();
init_signal_task();
para_unblock_signal(SIGCHLD);
PARA_NOTICE_LOG("initializing virtual streaming system\n");
- init_vss_task(afs_socket);
+ init_vss_task(afs_socket, &sched);
+ init_server_command_task(argc, argv);
+ if (conf.daemon_given)
+ kill(getppid(), SIGTERM);
PARA_NOTICE_LOG("server init complete\n");
}
int main(int argc, char *argv[])
{
int ret;
- static struct sched s = {
- .default_timeout = {
- .tv_sec = 1,
- .tv_usec = 0
- },
- .select_function = server_select
- };
+
+ sched.default_timeout.tv_sec = 1;
+ sched.select_function = server_select;
+
server_init(argc, argv);
mutex_lock(mmd_mutex);
- ret = schedule(&s);
+ ret = schedule(&sched);
if (ret < 0) {
PARA_EMERG_LOG("%s\n", para_strerror(-ret));
exit(EXIT_FAILURE);