X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=b4397c8ff192f4dfd0f16e4c7a3bd39254d65b6f;hp=b7334fc52c434a5c9cc69eb3f6fa3dcf8769e18c;hb=5f25c580aed568f05dd8ec285c2990ad1906b83d;hpb=a27ec6094608c05a9f87e445902c29d15ca11547 diff --git a/server.c b/server.c index b7334fc5..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" @@ -42,7 +30,8 @@ #include "string.h" #include "ipc.h" #include "fd.h" -#include "crypt.h" +#include "signal.h" +#include "user_list.h" /** define the array of error lists needed by para_server */ INIT_SERVER_ERRLISTS; @@ -50,16 +39,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; -char *user_list = NULL; -struct list_head _user_list; + +/** 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 +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; - 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 */ @@ -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); } @@ -276,110 +278,6 @@ static void setup_signal_handling(void) } } -/* - * lookup user in user_list file. Fills in a user struct containing - * filename of the user's public key as well as the permissions of that user. - * Returns 1 on success, 0 if user does not exist and < 0 on errors. - */ -static void populate_user_list(void) { - FILE *file_ptr = NULL; - char *char_ptr; - char line[MAXLINE]; - /* keyword, user, key, perms */ - char w[MAXLINE], n[MAXLINE], k[MAXLINE], p[MAXLINE], tmp[4][MAXLINE]; - int num, ret; - - file_ptr = fopen(user_list, "r"); - ret = -E_USERLIST; - if (!file_ptr) - goto out; - for (;;) { - struct _user *u; - ret = para_fgets(line, MAXLINE, file_ptr); - if (ret < 0) - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); - if (ret <= 0) - break; - if (sscanf(line,"%200s %200s %200s %200s", w, n, k, p) < 3) - continue; - if (strcmp(w, "user")) - continue; - PARA_DEBUG_LOG("found entry for %s\n", n); - u = para_malloc(sizeof(struct _user)); - u->name = para_strdup(n); - u->rsa = para_malloc(sizeof(RSA)); - ret = get_rsa_key(k, &u->rsa, 0 /* public */); - if (ret < 0) - break; - u->perms = 0; - char_ptr = p; - num = sscanf(char_ptr, "%200[A-Z_],%200[A-Z_],%200[A-Z_],%200[A-Z_]", - tmp[0], tmp[1], tmp[2], tmp[3]); - PARA_DEBUG_LOG("found %i perm entries\n", num); - u->perms = 0; - while (num > 0) { - num--; - if (!strcmp(tmp[num], "AFS_READ")) - u->perms |= AFS_READ; - else if (!strcmp(tmp[num], "AFS_WRITE")) - u->perms |= AFS_WRITE; - else if (!strcmp(tmp[num], "DB_READ")) - u->perms |= DB_READ; - else if (!strcmp(tmp[num], "DB_WRITE")) - u->perms |= DB_WRITE; - else /* unknown permission */ - PARA_WARNING_LOG("unknown permission: %s\n", - tmp[num]); - } - para_list_add(&u->node, &_user_list); - } -out: - if (file_ptr) - fclose(file_ptr); - if (ret >= 0) - return; - PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret)); - exit(EXIT_FAILURE); -} - -static void init_user_list(void) -{ - struct _user *u, *tmp; - static int initialized; - - if (initialized) { - list_for_each_entry_safe(u, tmp, &_user_list, node) { - list_del(&u->node); - free(u->name); - free(u->rsa); - free(u); - } - } else - INIT_LIST_HEAD(&_user_list); - initialized = 1; - populate_user_list(); -} - -/** - * lookup user in user_list. - * - * \param user: must initially contain the name of the user and is filled - * in by this function on success. - * - * \return 1 on success and < 0 on errors. - */ -int _get_user(struct _user *user) -{ - struct _user *u; - list_for_each_entry(u, &_user_list, node) { - if (strcmp(u->name, user->name)) - continue; - *user = *u; - return 1; - } - return -E_BAD_USER; -} - static void init_selector(void) { int i, ret; @@ -424,8 +322,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) @@ -453,20 +352,21 @@ 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); log_welcome("para_server", conf.loglevel_arg); shm_init(); /* init mmd struct */ server_uptime(UPTIME_SET); /* reset server uptime */ - init_user_list(); + 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(); @@ -505,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) @@ -514,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; @@ -522,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); @@ -530,8 +431,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[]) { @@ -552,7 +459,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) @@ -581,7 +488,7 @@ repeat: continue; senders[i].post_select(&rfds, &wfds); } - afs_send_chunk(); + vss_send_chunk(); status_refresh(); if (FD_ISSET(signal_pipe, &rfds)) { int sig;