X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=c11fb58a9cc234ee6316b3850b758b96286a65a7;hp=244c1ecd25da7959cf3ce6b9dcff3d9e814b2ad0;hb=f85e05c0b3951e7d3119983c118c82d71f2662a3;hpb=9d9ef4f91346188baaef1656b861151ea23437d9 diff --git a/server.c b/server.c index 244c1ecd..c11fb58a 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. */ @@ -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 #include +#include #include "para.h" #include "error.h" @@ -83,6 +85,7 @@ #include "sched.h" #include "signal.h" #include "user_list.h" +#include "color.h" /** Define the array of error lists needed by para_server. */ INIT_SERVER_ERRLISTS; @@ -107,15 +110,15 @@ struct server_args_info conf; /** A random value used in child context for authentication. */ uint32_t afs_socket_cookie; -/* global variables for server-internal use */ -static FILE *logfile; +/** 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; -static int mmd_mutex, mmd_shm_id; -static pid_t afs_pid; +static int mmd_shm_id; -/** The task resposible for server command handling. */ +/** The task responsible for server command handling. */ struct server_command_task { /** TCP port on which para_server listens for connections. */ int listen_fd; @@ -127,42 +130,36 @@ struct server_command_task { 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) +{ + 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) { - va_list argp; - FILE *outfd; - struct tm *tm; - time_t t1; - char str[MAXLINE] = ""; - pid_t mypid; - - if (ll < conf.loglevel_arg) + 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)); @@ -195,33 +192,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; + int ret, ll = conf.loglevel_arg; char *cf; + daemon_close_log(); if (conf.config_file_given) cf = para_strdup(conf.config_file_arg); else @@ -231,13 +215,13 @@ 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, @@ -249,8 +233,15 @@ static void parse_config(int override) 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(ll); + 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); @@ -274,12 +265,10 @@ 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 (afs_pid) - kill(afs_pid, SIGHUP); + if (mmd->afs_pid) + kill(mmd->afs_pid, SIGHUP); } static void signal_post_select(struct sched *s, struct task *t) @@ -300,7 +289,7 @@ static void signal_post_select(struct sched *s, struct task *t) int ret = para_reap_child(&pid); if (ret <= 0) break; - if (pid != afs_pid) + if (pid != mmd->afs_pid) continue; PARA_EMERG_LOG("fatal: afs died\n"); goto genocide; @@ -466,10 +455,10 @@ static int 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]); } @@ -499,22 +488,23 @@ static void server_init(int argc, char **argv) /* 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 */ if (conf.daemon_given) - daemon_init(); + daemonize(); PARA_NOTICE_LOG("initializing audio format handlers\n"); afh_init(); - mmd->server_pid = getpid(); - 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); @@ -552,9 +542,9 @@ 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; } @@ -577,7 +567,7 @@ int main(int argc, char *argv[]) .select_function = server_select }; server_init(argc, argv); - mmd_lock(); + mutex_lock(mmd_mutex); ret = schedule(&s); if (ret < 0) { PARA_EMERG_LOG("%s\n", para_strerror(-ret));