X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=79e67818c87a1573b312c00091c8199f41c286ed;hp=caeeba420eb55b8b2775f671b064dfb9b1dee181;hb=3781a3df94ce9bb28c98369df7a140fb4c086c23;hpb=2fff03e8e4644cdf18780f920285e70ebf192af0 diff --git a/server.c b/server.c index caeeba42..79e67818 100644 --- a/server.c +++ b/server.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2008 Andre Noll + * Copyright (C) 1997-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -10,12 +10,11 @@ /** * \mainpage Paraslash API Reference * - * Starting points for getting an overview are + * Starting points for getting an overview: * - * probably: * * - 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. @@ -23,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, @@ -64,8 +63,8 @@ */ #include -#include #include +#include #include "para.h" #include "error.h" @@ -86,11 +85,12 @@ #include "sched.h" #include "signal.h" #include "user_list.h" +#include "color.h" -/** define the array of error lists needed by para_server */ +/** Define the array of error lists needed by para_server. */ INIT_SERVER_ERRLISTS; -/** shut down non-authorized connections after that many seconds */ +/** Shut down non-authorized connections after that many seconds. */ #define ALARM_TIMEOUT 10 /** @@ -100,21 +100,24 @@ INIT_SERVER_ERRLISTS; struct misc_meta_data *mmd; /** - * the configuration of para_server + * The configuration of para_server * * It also contains the options for the audio file selector, audio format * handler and all supported senders. */ struct server_args_info conf; -/** the file containing user information (public key, permissions) */ -char *user_list_file = NULL; +/** A random value used in child context for authentication. */ +uint32_t afs_socket_cookie; + +/** The mutex protecting the shared memory area containing the mmd struct. */ +int mmd_mutex; + +/** The file containing user information (public key, permissions). */ +static char *user_list_file = NULL; -/* global variables for server-internal use */ -static FILE *logfile; -static int mmd_mutex, mmd_shm_id; -static int signal_pipe; +/** The task responsible for server command handling. */ struct server_command_task { /** TCP port on which para_server listens for connections. */ int listen_fd; @@ -123,58 +126,51 @@ struct server_command_task { /** Argument vector passed to para_server's main function. */ char **argv; /** The command task structure for scheduling. */ - //struct task task; - char dummy; + struct task task; }; -/** - * para_server's log function - * - * \param ll the log level - * \param fmt the format string describing the log message - */ -void para_log(int ll, const char* fmt,...) +static int want_colors(void) { - va_list argp; - FILE *outfd; - struct tm *tm; - time_t t1; - char str[MAXLINE] = ""; - pid_t mypid; - - if (ll < conf.loglevel_arg) + 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) +{ + int ret, i; + + if (!want_colors()) return; - outfd = logfile? logfile : stderr; - time(&t1); - tm = localtime(&t1); - strftime(str, MAXLINE, "%b %d %H:%M:%S", tm); - fprintf(outfd, "%s ", str); - if (conf.loglevel_arg <= INFO) - fprintf(outfd, "%i: ", ll); - mypid = getpid(); - if (conf.loglevel_arg <= INFO) - fprintf(outfd, "(%d) ", (int)mypid); - va_start(argp, fmt); - vfprintf(outfd, fmt, argp); - va_end(argp); + 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); + } } /* * 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)); + int shmid, ret = shm_new(sizeof(struct misc_meta_data)); if (ret < 0) goto err_out; - - ret = shm_attach(ret, ATTACH_RW, &shm); + shmid = ret; + ret = shm_attach(shmid, ATTACH_RW, &shm); + shm_destroy(shmid); if (ret < 0) goto err_out; mmd = shm; - mmd_shm_id = ret; ret = mutex_new(); if (ret < 0) @@ -195,33 +191,20 @@ err_out: } /** - * lock the shared memory area containing the mmd struct + * (Re-)read the server configuration files. * - * \sa semop(2), struct misc_meta_data. - */ -void mmd_lock(void) -{ - mutex_lock(mmd_mutex); -} - -/** - * unlock the shared memory area containing the mmd struct + * \param override Passed to gengetopt to activate the override feature. * - * \sa semop(2), struct misc_meta_data + * This function also re-opens the logfile and sets the global \a + * user_list_file variable. */ - -void mmd_unlock(void) -{ - mutex_unlock(mmd_mutex); -} - -static void parse_config(int override) +void parse_config_or_die(int override) { char *home = para_homedir(); - struct stat statbuf; int ret; char *cf; + daemon_close_log(); if (conf.config_file_given) cf = para_strdup(conf.config_file_arg); else @@ -231,26 +214,33 @@ static void parse_config(int override) user_list_file = make_message("%s/.paraslash/server.users", home); else user_list_file = para_strdup(conf.user_list_arg); - ret = stat(cf, &statbuf); - if (ret && conf.config_file_given) { + ret = file_exists(cf); + if (conf.config_file_given && !ret) { ret = -1; - PARA_EMERG_LOG("can not stat config file %s\n", cf); + PARA_EMERG_LOG("can not read config file %s\n", cf); goto out; } - if (!ret) { + if (ret) { int tmp = conf.daemon_given; struct server_cmdline_parser_params params = { .override = override, .initialize = 0, .check_required = 1, .check_ambiguity = 0, - .print_errors = 1 + .print_errors = !conf.daemon_given }; server_cmdline_parser_config_file(cf, &conf, ¶ms); conf.daemon_given = tmp; } - if (conf.logfile_given) - logfile = open_log(conf.logfile_arg); + if (conf.logfile_given) { + daemon_set_logfile(conf.logfile_arg); + daemon_open_log_or_die(); + } + daemon_set_loglevel(conf.loglevel_arg); + init_colors_or_die(); + daemon_set_flag(DF_LOG_PID); + daemon_set_flag(DF_LOG_LL); + daemon_set_flag(DF_LOG_TIME); ret = 1; out: free(cf); @@ -262,35 +252,145 @@ out: exit(EXIT_FAILURE); } -static void setup_signal_handling(void) +static void signal_pre_select(struct sched *s, struct task *t) { - signal_pipe = para_signal_init(); /* always successful */ + struct signal_task *st = container_of(t, struct signal_task, task); + para_fd_set(st->fd, &s->rfds, &s->max_fileno); +} - PARA_NOTICE_LOG("setting up signal handlers\n"); - if (para_install_sighandler(SIGINT) < 0) - goto err; - if (para_install_sighandler(SIGTERM) < 0) - goto err; - if (para_install_sighandler(SIGHUP) < 0) - goto err; - if (para_install_sighandler(SIGCHLD) < 0) - goto err; - if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) - goto err; - if (signal(SIGUSR1, SIG_IGN) == SIG_ERR) - goto err; - add_close_on_fork_list(signal_pipe); - return; -err: - PARA_EMERG_LOG("could not install signal handlers\n"); - exit(EXIT_FAILURE); +/* + * called when server gets SIGHUP or when client invokes hup command. + */ +static void handle_sighup(void) +{ + PARA_NOTICE_LOG("SIGHUP\n"); + 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); +} + +static void signal_post_select(struct sched *s, struct task *t) +{ + struct signal_task *st = container_of(t, struct signal_task, task); + + if (!FD_ISSET(st->fd, &s->rfds)) + return; + + st->signum = para_next_signal(); + switch (st->signum) { + case SIGHUP: + handle_sighup(); + break; + case SIGCHLD: + for (;;) { + pid_t pid; + int ret = para_reap_child(&pid); + if (ret <= 0) + break; + if (pid != mmd->afs_pid) + continue; + PARA_EMERG_LOG("fatal: afs died\n"); + goto genocide; + } + break; + /* die on sigint/sigterm. Kill all children too. */ + case SIGINT: + case SIGTERM: + PARA_EMERG_LOG("terminating on signal %d\n", st->signum); +genocide: + kill(0, SIGTERM); + free(mmd->afd.afhi.chunk_table); + free(mmd->afd.afhi.info_string); + close_listed_fds(); + mutex_destroy(mmd_mutex); + shm_detach(mmd); + exit(EXIT_FAILURE); + } +} + +static void init_signal_task(void) +{ + static struct signal_task signal_task_struct, + *st = &signal_task_struct; + + st->task.pre_select = signal_pre_select; + st->task.post_select = signal_post_select; + sprintf(st->task.status, "signal task"); + + PARA_NOTICE_LOG("setting up signal handling\n"); + st->fd = para_signal_init(); /* always successful */ + 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); + register_task(&st->task); +} + +static void command_pre_select(struct sched *s, struct task *t) +{ + struct server_command_task *sct = container_of(t, struct server_command_task, task); + para_fd_set(sct->listen_fd, &s->rfds, &s->max_fileno); +} + +static void command_post_select(struct sched *s, struct task *t) +{ + struct server_command_task *sct = container_of(t, struct server_command_task, task); + + int new_fd, ret, i; + char *peer_name; + pid_t child_pid; + + if (!FD_ISSET(sct->listen_fd, &s->rfds)) + return; + ret = para_accept(sct->listen_fd, NULL, 0); + if (ret < 0) + goto out; + new_fd = ret; + peer_name = remote_name(new_fd); + PARA_INFO_LOG("got connection from %s, forking\n", peer_name); + mmd->num_connects++; + mmd->active_connections++; + random(); + child_pid = fork(); + if (child_pid < 0) { + ret = -ERRNO_TO_PARA_ERROR(errno); + goto out; + } + if (child_pid) { + close(new_fd); + /* parent keeps accepting connections */ + return; + } + alarm(ALARM_TIMEOUT); + close_listed_fds(); + para_signal_shutdown(); + /* + * put info on who we are serving into argv[0] to make + * client ip visible in top/ps + */ + for (i = sct->argc - 1; i >= 0; i--) + memset(sct->argv[i], 0, strlen(sct->argv[i])); + sprintf(sct->argv[0], "para_server (serving %s)", peer_name); + return handle_connect(new_fd, peer_name); +out: + if (ret < 0) + PARA_CRIT_LOG("%s\n", para_strerror(-ret)); } -static void init_command_task(struct server_command_task *sct) +static void init_server_command_task(int argc, char **argv) { int ret; + static struct server_command_task server_command_task_struct, + *sct = &server_command_task_struct; PARA_NOTICE_LOG("initializing tcp command socket\n"); + sct->task.pre_select = command_pre_select; + sct->task.post_select = command_post_select; + sct->argc = argc; + sct->argv = argv; ret = para_listen(AF_UNSPEC, IPPROTO_TCP, conf.port_arg); if (ret < 0) goto err; @@ -299,6 +399,7 @@ static void init_command_task(struct server_command_task *sct) if (ret < 0) goto err; add_close_on_fork_list(sct->listen_fd); /* child doesn't need the listener */ + register_task(&sct->task); return; err: PARA_EMERG_LOG("%s\n", para_strerror(-ret)); @@ -334,11 +435,7 @@ err: exit(EXIT_FAILURE); } -uint32_t afs_socket_cookie; -int afs_socket; -static pid_t afs_pid; - -static void init_afs(void) +static int init_afs(void) { int ret, afs_server_socket[2]; @@ -346,26 +443,31 @@ static void init_afs(void) if (ret < 0) exit(EXIT_FAILURE); afs_socket_cookie = para_random((uint32_t)-1); - afs_pid = fork(); - if (afs_pid < 0) + mmd->afs_pid = fork(); + if (mmd->afs_pid < 0) exit(EXIT_FAILURE); - if (!afs_pid) { /* child (afs) */ + if (!mmd->afs_pid) { /* child (afs) */ close(afs_server_socket[0]); afs_init(afs_socket_cookie, afs_server_socket[1]); } close(afs_server_socket[1]); - afs_socket = afs_server_socket[0]; - ret = mark_fd_nonblocking(afs_socket); + ret = mark_fd_nonblocking(afs_server_socket[0]); if (ret < 0) exit(EXIT_FAILURE); - add_close_on_fork_list(afs_socket); - PARA_INFO_LOG("afs_socket: %d, afs_socket_cookie: %u\n", afs_socket, - (unsigned) afs_socket_cookie); + add_close_on_fork_list(afs_server_socket[0]); + PARA_INFO_LOG("afs_socket: %d, afs_socket_cookie: %u\n", + afs_server_socket[0], (unsigned) afs_socket_cookie); + return afs_server_socket[0]; +} + +__noreturn static void tmp_sigchld_handler(__a_unused int s) +{ + PARA_EMERG_LOG("caught early SIGCHLD\n"); + exit(EXIT_FAILURE); } static void server_init(int argc, char **argv) { - /* connector's address information */ struct server_cmdline_parser_params params = { .override = 0, .initialize = 1, @@ -373,46 +475,51 @@ static void server_init(int argc, char **argv) .check_ambiguity = 0, .print_errors = 1 }; + int afs_socket; + + valid_fd_012(); init_random_seed(); /* 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); - log_welcome("para_server", conf.loglevel_arg); - shm_init(); /* init mmd struct */ + parse_config_or_die(0); + log_welcome("para_server"); + 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 */ if (conf.daemon_given) - daemon_init(); + daemonize(); PARA_NOTICE_LOG("initializing audio format handlers\n"); afh_init(); - mmd->server_pid = getpid(); - setup_signal_handling(); + + /* + * Although afs uses its own signal handling we must ignore SIGUSR1 + * _before_ the afs child process gets born by init_afs() below. It's + * racy to do this in the child because the parent might send SIGUSR1 + * before the child gets a chance to ignore this signal -- only the + * good die young. + */ + para_sigaction(SIGUSR1, SIG_IGN); + /* + * We have to install a SIGCHLD handler before the afs process is being + * forked off. Otherwise, para_server does not notice if afs dies before + * the SIGCHLD handler has been installed by init_signal_task() below. + */ + para_sigaction(SIGCHLD, tmp_sigchld_handler); PARA_NOTICE_LOG("initializing the audio file selector\n"); - init_afs(); + afs_socket = init_afs(); + init_signal_task(); PARA_NOTICE_LOG("initializing virtual streaming system\n"); - vss_init(); - mmd_lock(); + init_vss_task(afs_socket); + init_server_command_task(argc, argv); PARA_NOTICE_LOG("server init complete\n"); } -/* - * called when server gets SIGHUP or when client invokes hup command. - */ -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 */ - init_user_list(user_list_file); /* reload user list */ - if (afs_pid) - kill(afs_pid, SIGHUP); -} - static void status_refresh(void) { static int prev_uptime = -1, prev_events = -1; @@ -421,10 +528,12 @@ static void status_refresh(void) if (prev_events != mmd->events) goto out; if (mmd->new_vss_status_flags != mmd->vss_status_flags) - goto out; + goto out_inc_events; if (uptime / 60 != prev_uptime / 60) - goto out; - ret = 0; + goto out_inc_events; + return; +out_inc_events: + mmd->events++; out: prev_uptime = uptime; prev_events = mmd->events; @@ -442,124 +551,36 @@ static int server_select(int max_fileno, fd_set *readfds, fd_set *writefds, int ret; status_refresh(); - mmd_unlock(); + mutex_unlock(mmd_mutex); ret = para_select(max_fileno + 1, readfds, writefds, timeout_tv); - mmd_lock(); + mutex_lock(mmd_mutex); return ret; } -static void command_pre_select(int *max_fileno, fd_set *rfds, char *dummy_ptr) -{ - struct server_command_task *sct = container_of(dummy_ptr, struct server_command_task, dummy); - para_fd_set(sct->listen_fd, rfds, max_fileno); -} - -static void command_post_select(fd_set *rfds, char *dummy_ptr) -{ - struct server_command_task *sct = container_of(dummy_ptr, struct server_command_task, dummy); - - int new_fd, ret; - char *peer_name; - pid_t child_pid; - - if (!FD_ISSET(sct->listen_fd, rfds)) - return; - ret = para_accept(sct->listen_fd, NULL, 0); - if (ret < 0) - goto out; - new_fd = ret; - peer_name = remote_name(new_fd); - PARA_INFO_LOG("got connection from %s, forking\n", peer_name); - mmd->num_connects++; - mmd->active_connections++; - random(); - child_pid = fork(); - if (child_pid < 0) { - ret = -ERRNO_TO_PARA_ERROR(errno); - goto out; - } - if (child_pid) { - close(new_fd); - /* parent keeps accepting connections */ - return; - } - alarm(ALARM_TIMEOUT); - close_listed_fds(); - para_signal_shutdown(); - /* - * put info on who we are serving into argv[0] to make - * client ip visible in top/ps - */ -// for (i = argc - 1; i >= 0; i--) -// memset(argv[i], 0, strlen(argv[i])); -// sprintf(argv[0], "para_server (serving %s)", peer_name); - return handle_connect(new_fd, peer_name); -out: - if (ret < 0) - PARA_CRIT_LOG("%s\n", para_strerror(-ret)); -} - /** - * the main function of para_server + * The main function of para_server. * - * \param argc usual argument count - * \param argv usual argument vector - * - * \return EXIT_SUCCESS or EXIT_FAILURE + * \param argc Usual argument count. + * \param argv Usual argument vector. * + * \return EXIT_SUCCESS or EXIT_FAILURE. */ int main(int argc, char *argv[]) { - int max_fileno, ret; - fd_set rfds, wfds; - struct timeval *timeout; - struct server_command_task server_command_task_struct; - - - valid_fd_012(); + int ret; + static struct sched s = { + .default_timeout = { + .tv_sec = 1, + .tv_usec = 0 + }, + .select_function = server_select + }; server_init(argc, argv); - init_command_task(&server_command_task_struct); -repeat: - FD_ZERO(&rfds); - FD_ZERO(&wfds); - max_fileno = -1; - command_pre_select(&max_fileno, &rfds, &server_command_task_struct.dummy); - para_fd_set(signal_pipe, &rfds, &max_fileno); - timeout = vss_preselect(&rfds, &wfds, &max_fileno); - server_select(max_fileno + 1, &rfds, &wfds, timeout); - vss_post_select(&rfds, &wfds); - if (FD_ISSET(signal_pipe, &rfds)) { - int sig; - pid_t pid; - sig = para_next_signal(); - switch (sig) { - case SIGHUP: - handle_sighup(); - break; - case SIGCHLD: - for (;;) { - ret = para_reap_child(&pid); - if (ret <= 0) - break; - if (pid != afs_pid) - continue; - PARA_EMERG_LOG("fatal: afs died\n"); - goto genocide; - } - break; - /* die on sigint/sigterm. Kill all children too. */ - case SIGINT: - case SIGTERM: - PARA_EMERG_LOG("terminating on signal %d\n", sig); -genocide: - kill(0, SIGTERM); - mutex_destroy(mmd_mutex); - shm_detach(mmd); - shm_destroy(mmd_shm_id); - - exit(EXIT_FAILURE); - } + mutex_lock(mmd_mutex); + ret = schedule(&s); + if (ret < 0) { + PARA_EMERG_LOG("%s\n", para_strerror(-ret)); + exit(EXIT_FAILURE); } - command_post_select(&rfds, &server_command_task_struct.dummy); - goto repeat; + exit(EXIT_SUCCESS); }