X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=90f8cd535d67ac022284118e622e8f3528cf6099;hp=6195266bb8f87ca168c410c44aef5dfac18586b4;hb=a4aada551a8f979918024e28343b90e0690542c2;hpb=6693375b52f2712ace6dc50b717de9cb371a7c2a diff --git a/server.c b/server.c index 6195266b..90f8cd53 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 */ @@ -28,11 +16,12 @@ */ - +#include "para.h" #include "server.cmdline.h" -#include "db.h" +#include "afs_common.h" +#include "afh.h" #include "server.h" -#include "afs.h" +#include "vss.h" #include "config.h" #include "close_on_fork.h" #include "send.h" @@ -42,8 +31,11 @@ #include "string.h" #include "ipc.h" #include "fd.h" +#include "list.h" +#include "sched.h" #include "signal.h" #include "user_list.h" +#include "afs.h" /** define the array of error lists needed by para_server */ INIT_SERVER_ERRLISTS; @@ -51,15 +43,23 @@ 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. -*/ + * 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 *); @@ -182,8 +182,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: @@ -236,7 +236,13 @@ static void parse_config(int override) } if (!ret) { int tmp = conf.daemon_given; - server_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 */ @@ -320,8 +326,9 @@ err: 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/urandom", O_RDONLY); if (fd < 0) @@ -341,6 +348,30 @@ out: exit(EXIT_FAILURE); } +uint32_t afs_socket_cookie; +static int afs_socket; +pid_t afs_pid; + +static void init_afs(void) +{ + int ret, afs_server_socket[2]; + + ret = socketpair(PF_UNIX, SOCK_DGRAM, 0, afs_server_socket); + if (ret < 0) + exit(EXIT_FAILURE); + afs_socket_cookie = para_random((uint32_t)-1); + afs_pid = fork(); + if (afs_pid < 0) + exit(EXIT_FAILURE); + if (!afs_pid) /* child (afs) */ + afs_init(afs_socket_cookie, afs_server_socket[1]); + close(afs_server_socket[1]); + afs_socket = afs_server_socket[0]; + PARA_INFO_LOG("afs_socket: %d, afs_socket_cookie: %u\n", afs_socket, + (unsigned) afs_socket_cookie); +} + + static unsigned do_inits(int argc, char **argv) { /* connector's address information */ @@ -349,6 +380,7 @@ static unsigned do_inits(int argc, char **argv) init_random_seed(); /* parse command line options */ 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); @@ -360,11 +392,12 @@ static unsigned do_inits(int argc, char **argv) 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(); + init_afs(); mmd_lock(); /* init network socket */ PARA_NOTICE_LOG("%s", "initializing tcp command socket\n"); @@ -411,7 +444,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; @@ -419,7 +452,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); @@ -427,8 +460,14 @@ 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[]) { @@ -449,7 +488,7 @@ repeat: /* check socket and signal pipe in any case */ para_fd_set(sockfd, &rfds, &max_fileno); para_fd_set(signal_pipe, &rfds, &max_fileno); - timeout = afs_preselect(); + timeout = vss_preselect(); status_refresh(); for (i = 0; senders[i].name; i++) { if (senders[i].status != SENDER_ON) @@ -478,27 +517,38 @@ repeat: continue; senders[i].post_select(&rfds, &wfds); } - afs_send_chunk(); + vss_send_chunk(); status_refresh(); if (FD_ISSET(signal_pipe, &rfds)) { int sig; + pid_t pid; sig = para_next_signal(); switch (sig) { case SIGHUP: handle_sighup(); break; case SIGCHLD: - para_reap_children(); + for (;;) { + pid = para_reap_child(); + if (pid <= 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); selectors[mmd->selector_num].shutdown(); mutex_destroy(mmd_mutex); shm_detach(mmd); shm_destroy(mmd_shm_id); + exit(EXIT_FAILURE); } }