/*
- * Copyright (C) 1997-2014 Andre Noll <maan@tuebingen.mpg.de>
+ * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file server.c Paraslash's main server. */
/**
- * \mainpage Main data structures:
+ * \mainpage Main data structures and selected APIs:
*
- * - Server: \ref server_command, \ref sender,
+ * - Senders: \ref sender,
* - Audio file selector: \ref afs_info, \ref afs_table,
* - Audio format handler: \ref audio_format_handler, \ref afh_info
* - Receivers/filters/writers: \ref receiver, \ref receiver_node,
* \ref filter, \ref filter_node, \ref writer_node, \ref writer.
- *
- * Selected APIs:
- *
* - Scheduling: \ref sched.h,
* - Buffer trees: \ref buffer_tree.h,
* - Sideband API: \ref sideband.h,
* - Crypto: \ref crypt.h, \ref crypt_backend.h,
- * - Error subsystem: \ref error.h, \ref error2.c,
+ * - Error subsystem: \ref error.h,
* - Inter process communication: \ref ipc.h,
* - Forward error correction: \ref fec.h,
* - Daemons: \ref daemon.h,
* - Interactive sessions: \ref interactive.h,
* - File descriptors: \ref fd.h,
* - Signals: \ref signal.h,
- * - Networking: \ref net.h,
+ * - Networking: \ref net.h,
* - Time: \ref time.c,
* - Doubly linked lists: \ref list.h.
*/
#include "ggo.h"
#include "version.h"
-__printf_2_3 void (*para_log)(int, const char*, ...) = daemon_log;
+/** Array of error strings. */
+DEFINE_PARA_ERRLIST;
-/** Define the array of error lists needed by para_server. */
-INIT_SERVER_ERRLISTS;
+__printf_2_3 void (*para_log)(int, const char*, ...) = daemon_log;
/** Shut down non-authorized connections after that many seconds. */
#define ALARM_TIMEOUT 10
/**
* Pointer to shared memory area for communication between para_server
- * and its children. Exported to vss.c. command.c and to afs.
+ * and its children. Exported to vss.c, command.c and to afs.
*/
struct misc_meta_data *mmd;
static char *user_list_file = NULL;
static struct sched sched;
+static struct signal_task *signal_task;
/** The task responsible for server command handling. */
struct server_command_task {
struct task *task;
};
-static int want_colors(void)
-{
- if (conf.color_arg == color_arg_no)
- return 0;
- if (conf.color_arg == color_arg_yes)
- return 1;
- if (conf.logfile_given)
- return 0;
- return isatty(STDERR_FILENO);
-}
-
-static void init_colors_or_die(void)
+/**
+ * Return the list of tasks for the server process.
+ *
+ * This is called from \a com_tasks(). The helper is necessary since command
+ * handlers can not access the scheduler structure directly.
+ *
+ * \return A dynamically allocated string that must be freed by the caller.
+ */
+char *server_get_tasks(void)
{
- 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++)
- daemon_set_log_color_or_die(conf.log_color_arg[i]);
+ return get_task_list(&sched);
}
/*
daemon_set_logfile(conf.logfile_arg);
daemon_open_log_or_die();
}
- init_colors_or_die();
+
+ if (daemon_init_colors_or_die(conf.color_arg, color_arg_auto, color_arg_no,
+ conf.logfile_given)) {
+ int i;
+ for (i = 0; i < conf.log_color_given; i++)
+ daemon_set_log_color_or_die(conf.log_color_arg[i]);
+ }
daemon_set_flag(DF_LOG_PID);
daemon_set_flag(DF_LOG_LL);
daemon_set_flag(DF_LOG_TIME);
exit(EXIT_FAILURE);
}
-static void signal_pre_select(struct sched *s, void *context)
-{
- struct signal_task *st = context;
- para_fd_set(st->fd, &s->rfds, &s->max_fileno);
-}
-
/*
* called when server gets SIGHUP or when client invokes hup command.
*/
static void init_signal_task(void)
{
- static struct signal_task signal_task_struct,
- *st = &signal_task_struct;
-
- PARA_NOTICE_LOG("setting up signal handling\n");
- st->fd = para_signal_init(); /* always successful */
+ signal_task = signal_init_or_die();
para_install_sighandler(SIGINT);
para_install_sighandler(SIGTERM);
para_install_sighandler(SIGHUP);
para_install_sighandler(SIGCHLD);
para_sigaction(SIGPIPE, SIG_IGN);
- add_close_on_fork_list(st->fd);
- st->task = task_register(&(struct task_info) {
+ add_close_on_fork_list(signal_task->fd);
+ signal_task->task = task_register(&(struct task_info) {
.name = "signal",
.pre_select = signal_pre_select,
.post_select = signal_post_select,
- .context = st,
+ .context = signal_task,
}, &sched);
}
free(chunk_table);
alarm(ALARM_TIMEOUT);
close_listed_fds();
- para_signal_shutdown();
+ signal_shutdown(signal_task);
/*
* put info on who we are serving into argv[0] to make
* client ip visible in top/ps
{
int ret, afs_server_socket[2];
pid_t afs_pid;
+ char c;
- ret = socketpair(PF_UNIX, SOCK_DGRAM, 0, afs_server_socket);
+ ret = socketpair(PF_UNIX, SOCK_STREAM, 0, afs_server_socket);
if (ret < 0)
exit(EXIT_FAILURE);
get_random_bytes_or_die((unsigned char *)&afs_socket_cookie,
exit(EXIT_FAILURE);
if (afs_pid == 0) { /* child (afs) */
int i;
+
for (i = argc - 1; i >= 0; i--)
memset(argv[i], 0, strlen(argv[i]));
sprintf(argv[0], "para_server (afs)");
}
mmd->afs_pid = afs_pid;
close(afs_server_socket[1]);
+ if (read(afs_server_socket[0], &c, 1) <= 0) {
+ PARA_EMERG_LOG("early afs exit\n");
+ exit(EXIT_FAILURE);
+ }
ret = mark_fd_nonblocking(afs_server_socket[0]);
if (ret < 0)
exit(EXIT_FAILURE);
.check_ambiguity = 0,
.print_errors = 1
};
- int afs_socket;
+ int afs_socket, daemon_pipe = -1;
valid_fd_012();
init_random_seed_or_die();
version_handle_flag("server", conf.version_given);
if (conf.help_given || conf.detailed_help_given)
print_help_and_die();
+ daemon_set_priority(conf.priority_arg);
daemon_drop_privileges_or_die(conf.user_arg, conf.group_arg);
/* parse config file, open log and set defaults */
parse_config_or_die(0);
- daemon_log_welcome("para_server");
+ daemon_log_welcome("server");
init_ipc_or_die(); /* init mmd struct and mmd->lock */
daemon_set_start_time();
init_user_list(user_list_file);
/* become daemon */
if (conf.daemon_given)
- daemonize(true /* parent waits for SIGTERM */);
+ daemon_pipe = daemonize(true /* parent waits for us */);
PARA_NOTICE_LOG("initializing audio format handlers\n");
afh_init();
PARA_NOTICE_LOG("initializing virtual streaming system\n");
init_vss_task(afs_socket, &sched);
init_server_command_task(argc, argv);
- if (conf.daemon_given)
- kill(getppid(), SIGTERM);
+ if (daemon_pipe >= 0) {
+ if (write(daemon_pipe, "\0", 1) < 0) {
+ PARA_EMERG_LOG("daemon_pipe: %s", strerror(errno));
+ exit(EXIT_FAILURE);
+ }
+ close(daemon_pipe);
+ }
PARA_NOTICE_LOG("server init complete\n");
}
prev_uptime = uptime;
prev_events = mmd->events;
mmd->vss_status_flags = mmd->new_vss_status_flags;
- PARA_DEBUG_LOG("%d events, forcing status update\n", mmd->events);
+ PARA_DEBUG_LOG("%u events, forcing status update\n", mmd->events);
killpg(0, SIGUSR1);
}
projects / paraslash.git / blobdiff