X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=b4397c8ff192f4dfd0f16e4c7a3bd39254d65b6f;hp=69643208beea484ea067cac2f09b8ad1fe6c24f5;hb=6ce1f648d6e34e49472ce938c83e5bf8e65cd429;hpb=974c531493fb3c36243f266fb72e2cba561aafd6 diff --git a/server.c b/server.c index 69643208..b4397c8f 100644 --- a/server.c +++ b/server.c @@ -1,19 +1,7 @@ /* - * Copyright (C) 1997-2006 Andre Noll + * Copyright (C) 1997-2007 Andre Noll * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file server.c Paraslash's main server */ @@ -30,9 +18,9 @@ #include "server.cmdline.h" -#include "db.h" -#include "server.h" #include "afs.h" +#include "server.h" +#include "vss.h" #include "config.h" #include "close_on_fork.h" #include "send.h" @@ -41,6 +29,9 @@ #include "daemon.h" #include "string.h" #include "ipc.h" +#include "fd.h" +#include "signal.h" +#include "user_list.h" /** define the array of error lists needed by para_server */ INIT_SERVER_ERRLISTS; @@ -48,21 +39,30 @@ INIT_SERVER_ERRLISTS; /** shut down non-authorized connections after that many seconds */ #define ALARM_TIMEOUT 10 -/* these are exported to afs.c. command.c and to all selectors */ +/** + * pointer to shared memory area for communication between para_server + * and its children. exported to vss.c. command.c and to all selectors. + */ struct misc_meta_data *mmd; -/** the configuration of para_server + +/** + * the configuration of para_server * - * It also contains the options for all audio file selectors and all supported - * senders. -*/ -struct gengetopt_args_info conf; -char *user_list = NULL; + * It also contains the options for all audio file selectors, 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; + +extern void dccp_send_init(struct sender *); extern void http_send_init(struct sender *); extern void ortp_send_init(struct sender *); -extern struct audio_format afl[]; +/* TODO: This is better handled by autoconf */ /** the list of supported audio file selectors */ -struct audio_file_selector dblist[] = { +struct audio_file_selector selectors[] = { { .name = "random", .init = random_selector_init, @@ -95,6 +95,10 @@ struct sender senders[] = { .name = "http", .init = http_send_init, }, + { + .name = "dccp", + .init = dccp_send_init, + }, #ifdef HAVE_ORTP { .name = "ortp", @@ -118,7 +122,7 @@ static int signal_pipe; * \param ll the log level * \param fmt the format string describing the log message */ -void para_log(int ll, char* fmt,...) +void para_log(int ll, const char* fmt,...) { va_list argp; FILE *outfd; @@ -129,15 +133,7 @@ void para_log(int ll, char* fmt,...) if (ll < conf.loglevel_arg) return; - if (!logfile) { - if (ll < WARNING) - outfd = stdout; - else - outfd = stderr; - } else - outfd = logfile; - if (conf.daemon_given && !logfile) - return; + outfd = logfile? logfile : stderr; time(&t1); tm = localtime(&t1); strftime(str, MAXLINE, "%b %d %H:%M:%S", tm); @@ -182,8 +178,8 @@ static void shm_init(void) mmd->active_connections = 0; strcpy(mmd->filename, "(none)"); mmd->audio_format = -1; - mmd->afs_status_flags = AFS_NEXT; - mmd->new_afs_status_flags = AFS_NEXT; + mmd->vss_status_flags = VSS_NEXT; + mmd->new_vss_status_flags = VSS_NEXT; mmd->sender_cmd_data.cmd_num = -1; return; err_out: @@ -223,11 +219,11 @@ static void parse_config(int override) cf = conf.config_file_arg; else cf = make_message("%s/.paraslash/server.conf", home); - free(user_list); + free(user_list_file); if (!conf.user_list_given) - user_list = make_message("%s/.paraslash/server.users", home); + user_list_file = make_message("%s/.paraslash/server.users", home); else - user_list = para_strdup(conf.user_list_arg); + user_list_file = para_strdup(conf.user_list_arg); ret = stat(cf, &statbuf); if (ret && conf.config_file_given) { ret = -1; @@ -236,7 +232,13 @@ static void parse_config(int override) } if (!ret) { int tmp = conf.daemon_given; - cmdline_parser_configfile(cf, &conf, override, 0, 0); + struct server_cmdline_parser_params params = { + .override = override, + .initialize = 0, + .check_required = 0, + .check_ambiguity = 0 + }; + server_cmdline_parser_config_file(cf, &conf, ¶ms); conf.daemon_given = tmp; } /* logfile */ @@ -253,8 +255,8 @@ out: free(home); if (ret > 0) return; - free(user_list); - user_list = NULL; + free(user_list_file); + user_list_file = NULL; exit(EXIT_FAILURE); } @@ -263,7 +265,6 @@ static void setup_signal_handling(void) int ret = 0; signal_pipe = para_signal_init(); -// fcntl(signal_pipe, F_SETFL, O_NONBLOCK); PARA_NOTICE_LOG("%s", "setting up signal handlers\n"); ret += para_install_sighandler(SIGINT); ret += para_install_sighandler(SIGTERM); @@ -284,12 +285,12 @@ static void init_selector(void) mmd->selector_change = -1; /* no change nec., set to new num by com_chs */ if (!conf.selector_given) goto random; - for (i = 0; dblist[i].name; i++) { - if (strcmp(dblist[i].name, conf.selector_arg)) + for (i = 0; selectors[i].name; i++) { + if (strcmp(selectors[i].name, conf.selector_arg)) continue; PARA_NOTICE_LOG("initializing %s audio file selector\n", - dblist[i].name); - ret = dblist[i].init(&dblist[i]); + selectors[i].name); + ret = selectors[i].init(&selectors[i]); if (ret < 0) { PARA_WARNING_LOG("%s", PARA_STRERROR(-ret)); break; @@ -300,24 +301,32 @@ static void init_selector(void) PARA_WARNING_LOG("%s", "falling back to the random selector\n"); random: mmd->selector_num = 0; - dblist[0].init(&dblist[0]); /* always successful */ + selectors[0].init(&selectors[0]); /* always successful */ } static unsigned init_network(void) { - int sockfd = init_tcp_socket(conf.port_arg); + int fd, ret = init_tcp_socket(conf.port_arg); - if (sockfd < 0) - exit(EXIT_FAILURE); - return sockfd; + if (ret < 0) + goto err; + fd = ret; + ret = mark_fd_nonblock(fd); + if (ret < 0) + goto err; + return fd; +err: + PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret)); + exit(EXIT_FAILURE); } static void init_random_seed(void) { - int fd, ret = -1, len = sizeof(unsigned int); + int fd, ret = -1; unsigned int seed; + size_t len = sizeof(unsigned int); - fd = open("/dev/random", O_RDONLY); + fd = open("/dev/urandom", O_RDONLY); if (fd < 0) goto out; ret = -2; @@ -342,30 +351,28 @@ static unsigned do_inits(int argc, char **argv) init_random_seed(); /* parse command line options */ - cmdline_parser(argc, argv, &conf); - para_drop_privileges(conf.user_arg); + server_cmdline_parser(argc, argv, &conf); + HANDLE_VERSION_FLAG("server", conf); + para_drop_privileges(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 */ server_uptime(UPTIME_SET); /* reset server uptime */ + init_user_list(user_list_file); /* become daemon */ if (conf.daemon_given) daemon_init(); init_selector(); - PARA_NOTICE_LOG("%s", "initializing audio file sender\n"); - /* audio file sender */ - afs_init(); +// PARA_ERROR_LOG("num: %d\n", mmd->selector_num); + PARA_NOTICE_LOG("%s", "initializing virtual streaming system\n"); + vss_init(); mmd->server_pid = getpid(); setup_signal_handling(); mmd_lock(); /* init network socket */ PARA_NOTICE_LOG("%s", "initializing tcp command socket\n"); sockfd = init_network(); - if (conf.autoplay_given) { - mmd->afs_status_flags |= AFS_PLAYING; - mmd->new_afs_status_flags |= AFS_PLAYING; - } PARA_NOTICE_LOG("%s", "init complete\n"); return sockfd; } @@ -374,8 +381,8 @@ static void change_selector(void) { int ret, old = mmd->selector_num, new = mmd->selector_change; - dblist[old].shutdown(); - ret = dblist[new].init(&dblist[new]); + selectors[old].shutdown(); + ret = selectors[new].init(&selectors[new]); mmd->selector_change = -1; /* reset */ if (ret >= 0) { mmd->selector_num = new; @@ -383,7 +390,7 @@ static void change_selector(void) } /* init failed */ PARA_ERROR_LOG("%s -- switching to the random selector\n", PARA_STRERROR(-ret)); - dblist[0].init(&dblist[0]); + selectors[0].init(&selectors[0]); mmd->selector_num = 0; } @@ -398,6 +405,7 @@ static void handle_sighup(void) parse_config(1); /* reopens log */ mmd->selector_change = mmd->selector_num; /* do not change selector.. */ change_selector(); /* .. just reload */ + init_user_list(user_list_file); /* reload user list */ } static void status_refresh(void) @@ -407,7 +415,7 @@ static void status_refresh(void) if (prev_events != mmd->events) goto out; - if (mmd->new_afs_status_flags != mmd->afs_status_flags) + if (mmd->new_vss_status_flags != mmd->vss_status_flags) goto out; if (uptime / 60 != prev_uptime / 60) goto out; @@ -415,7 +423,7 @@ static void status_refresh(void) out: prev_uptime = uptime; prev_events = mmd->events; - mmd->afs_status_flags = mmd->new_afs_status_flags; + mmd->vss_status_flags = mmd->new_vss_status_flags; if (ret) { PARA_DEBUG_LOG("%d events, forcing status update, af = %d\n", mmd->events, mmd->audio_format); @@ -423,15 +431,21 @@ out: } } -/* - * MAIN +/** + * the main function of para_server + * + * \param argc usual argument count + * \param argv usual argument vector + * + * \return EXIT_SUCCESS or EXIT_FAILURE + * */ int main(int argc, char *argv[]) { /* listen on sock_fd, new connection on new_fd */ int sockfd, new_fd; struct sockaddr_in their_addr; - int err, i, max_fileno, ret; + int i, max_fileno, ret; pid_t chld_pid; fd_set rfds, wfds; struct timeval *timeout; @@ -439,59 +453,43 @@ int main(int argc, char *argv[]) valid_fd_012(); sockfd = do_inits(argc, argv); repeat: - /* check socket and signal pipe in any case */ FD_ZERO(&rfds); FD_ZERO(&wfds); - FD_SET(sockfd, &rfds); - max_fileno = sockfd; - FD_SET(signal_pipe, &rfds); - max_fileno = MAX(max_fileno, signal_pipe); - - timeout = afs_preselect(); + max_fileno = -1; + /* check socket and signal pipe in any case */ + para_fd_set(sockfd, &rfds, &max_fileno); + para_fd_set(signal_pipe, &rfds, &max_fileno); + timeout = vss_preselect(); status_refresh(); for (i = 0; senders[i].name; i++) { if (senders[i].status != SENDER_ON) continue; if (!senders[i].pre_select) continue; - senders[i].pre_select(mmd->audio_format >= 0? - &afl[mmd->audio_format] : NULL, - &max_fileno, - &rfds, &wfds); + senders[i].pre_select( &max_fileno, &rfds, &wfds); } - if (dblist[mmd->selector_num].pre_select) { - ret = dblist[mmd->selector_num].pre_select(&rfds, &wfds); - max_fileno = MAX(max_fileno, ret); + if (selectors[mmd->selector_num].pre_select) { + ret = selectors[mmd->selector_num].pre_select(&rfds, &wfds); + max_fileno = PARA_MAX(max_fileno, ret); } mmd_unlock(); -// PARA_DEBUG_LOG("%s: select (max = %i)\n", __func__, max_fileno); - ret = select(max_fileno + 1, &rfds, &wfds, NULL, timeout); - err = errno; - //PARA_DEBUG_LOG("%s: select returned %i\n", __func__, ret); + ret = para_select(max_fileno + 1, &rfds, &wfds, timeout); mmd_lock(); if (mmd->selector_change >= 0) change_selector(); - if (dblist[mmd->selector_num].post_select) - dblist[mmd->selector_num].post_select(&rfds, &wfds); - if (ret < 0 && err == EINTR) - goto repeat; - if (ret < 0) { - PARA_CRIT_LOG("select error (%s)\n", strerror(err)); + if (selectors[mmd->selector_num].post_select) + selectors[mmd->selector_num].post_select(&rfds, &wfds); + if (ret < 0) goto repeat; - } for (i = 0; senders[i].name; i++) { if (senders[i].status != SENDER_ON) continue; if (!senders[i].post_select) continue; - senders[i].post_select(mmd->audio_format >= 0? - &afl[mmd->audio_format] : NULL, - &rfds, &wfds); - } - if (!ret) { - afs_send_chunk(); - status_refresh(); + senders[i].post_select(&rfds, &wfds); } + vss_send_chunk(); + status_refresh(); if (FD_ISSET(signal_pipe, &rfds)) { int sig; sig = para_next_signal(); @@ -507,7 +505,7 @@ repeat: case SIGTERM: PARA_EMERG_LOG("terminating on signal %d\n", sig); kill(0, SIGTERM); - dblist[mmd->selector_num].shutdown(); + selectors[mmd->selector_num].shutdown(); mutex_destroy(mmd_mutex); shm_detach(mmd); shm_destroy(mmd_shm_id);