X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=d98009d0097f25540174e1a79f194dada46093e4;hp=43ede2a91b752667ad4090e2742c4a844bf66250;hb=d4603bf234d23adb56b208efb90ce66772c4ef5b;hpb=9d24300965cbcdfddb9f63b6bc8018da50d7d8e1 diff --git a/server.c b/server.c index 43ede2a9..d98009d0 100644 --- a/server.c +++ b/server.c @@ -1,8 +1,4 @@ -/* - * Copyright (C) 1997 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 1997 Andre Noll , see file COPYING. */ /** \file server.c Paraslash's main server. */ @@ -45,10 +41,12 @@ #include "server.lsg.h" #include "para.h" #include "error.h" +#include "lsu.h" #include "crypt.h" #include "afh.h" #include "string.h" #include "afs.h" +#include "net.h" #include "server.h" #include "list.h" #include "send.h" @@ -56,7 +54,6 @@ #include "vss.h" #include "config.h" #include "close_on_fork.h" -#include "net.h" #include "daemon.h" #include "ipc.h" #include "fd.h" @@ -90,7 +87,15 @@ struct lls_parse_result *server_lpr = NULL; /* Command line options (no config file options). Used in handle_sighup(). */ static struct lls_parse_result *cmdline_lpr; -/** A random value used in child context for authentication. */ +/** + * A random number used to "authenticate" the afs connection. + * + * para_server picks this number by random before it forks the afs process. The + * command handlers know this number as well and write it to the afs socket, + * together with the id of the shared memory area which contains the payload of + * the afs command. A local process has to know this number to abuse the afs + * service provided by the local socket. + */ uint32_t afs_socket_cookie; /** The mutex protecting the shared memory area containing the mmd struct. */ @@ -99,6 +104,9 @@ int mmd_mutex; static struct sched sched; static struct signal_task *signal_task; +/** The process id of the audio file selector process. */ +pid_t afs_pid = 0; + /** The task responsible for server command handling. */ struct server_command_task { /** TCP port on which para_server listens for connections. */ @@ -170,58 +178,20 @@ err_out: void parse_config_or_die(bool reload) { int ret; - char *cf = NULL, *errctx = NULL, *user_list_file = NULL; - void *map; - size_t sz; - int cf_argc; - char **cf_argv; - struct lls_parse_result *cf_lpr, *merged_lpr; - char *home = para_homedir(); - - daemon_close_log(); - if (OPT_GIVEN(CONFIG_FILE)) - cf = para_strdup(OPT_STRING_VAL(CONFIG_FILE)); - else - cf = make_message("%s/.paraslash/server.conf", home); - if (!mmd || getpid() != mmd->afs_pid) { - if (OPT_GIVEN(USER_LIST)) - user_list_file = para_strdup(OPT_STRING_VAL(USER_LIST)); - else - user_list_file = make_message("%s/.paraslash/server.users", home); - } - free(home); - ret = mmap_full_file(cf, O_RDONLY, &map, &sz, NULL); - if (ret < 0) { - if (ret != -E_EMPTY && ret != -ERRNO_TO_PARA_ERROR(ENOENT)) - goto free_cf; - if (ret == -ERRNO_TO_PARA_ERROR(ENOENT) && OPT_GIVEN(CONFIG_FILE)) - goto free_cf; - ret = 0; - server_lpr = cmdline_lpr; - goto success; - } - ret = lls(lls_convert_config(map, sz, NULL, &cf_argv, &errctx)); - para_munmap(map, sz); - if (ret < 0) - goto free_cf; - cf_argc = ret; - ret = lls(lls_parse(cf_argc, cf_argv, CMD_PTR, &cf_lpr, &errctx)); - lls_free_argv(cf_argv); - if (ret < 0) - goto free_cf; - if (reload) /* config file overrides command line */ - ret = lls(lls_merge(cf_lpr, cmdline_lpr, CMD_PTR, &merged_lpr, - &errctx)); - else /* command line options overrride config file options */ - ret = lls(lls_merge(cmdline_lpr, cf_lpr, CMD_PTR, &merged_lpr, - &errctx)); - lls_free_parse_result(cf_lpr, CMD_PTR); - if (ret < 0) - goto free_cf; + unsigned flags = MCF_DONT_FREE; + if (server_lpr != cmdline_lpr) lls_free_parse_result(server_lpr, CMD_PTR); - server_lpr = merged_lpr; -success: + server_lpr = cmdline_lpr; + if (reload) + flags |= MCF_OVERRIDE; + ret = lsu_merge_config_file_options(OPT_STRING_VAL(CONFIG_FILE), + "server.conf", &server_lpr, CMD_PTR, server_suite, flags); + if (ret < 0) { + PARA_EMERG_LOG("failed to parse config file: %s\n", + para_strerror(-ret)); + exit(EXIT_FAILURE); + } daemon_set_loglevel(ENUM_STRING_VAL(LOGLEVEL)); if (OPT_GIVEN(LOGFILE)) { daemon_set_logfile(OPT_STRING_VAL(LOGFILE)); @@ -240,19 +210,19 @@ success: if (OPT_GIVEN(LOG_TIMING)) daemon_set_flag(DF_LOG_TIMING); daemon_set_priority(OPT_UINT32_VAL(PRIORITY)); - if (user_list_file) + if (!reload || getpid() != afs_pid) { + char *user_list_file; + if (OPT_GIVEN(USER_LIST)) + user_list_file = para_strdup(OPT_STRING_VAL(USER_LIST)); + else { + char *home = para_homedir(); + user_list_file = make_message("%s/.paraslash/server.users", home); + free(home); + } init_user_list(user_list_file); - ret = 1; -free_cf: - free(cf); - free(user_list_file); - if (ret < 0) { - if (errctx) - PARA_ERROR_LOG("%s\n", errctx); - free(errctx); - PARA_EMERG_LOG("%s\n", para_strerror(-ret)); - exit(EXIT_FAILURE); + free(user_list_file); } + return; } /* @@ -263,8 +233,8 @@ static void handle_sighup(void) PARA_NOTICE_LOG("SIGHUP\n"); parse_config_or_die(true); - if (mmd->afs_pid) - kill(mmd->afs_pid, SIGHUP); + if (afs_pid != 0) + kill(afs_pid, SIGHUP); } static int signal_post_select(struct sched *s, __a_unused void *context) @@ -283,7 +253,7 @@ static int signal_post_select(struct sched *s, __a_unused void *context) int ret = para_reap_child(&pid); if (ret <= 0) break; - if (pid != mmd->afs_pid) + if (pid != afs_pid) continue; PARA_EMERG_LOG("fatal: afs died\n"); kill(0, SIGTERM); @@ -309,8 +279,8 @@ static int signal_post_select(struct sched *s, __a_unused void *context) * processes get killed immediately by the above kill(). */ PARA_INFO_LOG("waiting for afs (pid %d) to die\n", - (int)mmd->afs_pid); - waitpid(mmd->afs_pid, NULL, 0); + (int)afs_pid); + waitpid(afs_pid, NULL, 0); cleanup: free(mmd->afd.afhi.chunk_table); close_listed_fds(); @@ -357,8 +327,6 @@ static int command_post_select(struct sched *s, void *context) ret = para_accept(sct->listen_fd, &s->rfds, NULL, 0, &new_fd); if (ret <= 0) goto out; - peer_name = remote_name(new_fd); - PARA_INFO_LOG("got connection from %s, forking\n", peer_name); mmd->num_connects++; mmd->active_connections++; /* @@ -384,6 +352,8 @@ static int command_post_select(struct sched *s, void *context) /* parent keeps accepting connections */ return 0; } + peer_name = remote_name(new_fd); + PARA_INFO_LOG("accepted connection from %s\n", peer_name); /* mmd might already have changed at this point */ free(chunk_table); alarm(ALARM_TIMEOUT); @@ -397,7 +367,7 @@ static int command_post_select(struct sched *s, void *context) memset(sct->argv[i], 0, strlen(sct->argv[i])); i = sct->argc - 1 - lls_num_inputs(cmdline_lpr); sprintf(sct->argv[i], "para_server (serving %s)", peer_name); - handle_connect(new_fd, peer_name); + handle_connect(new_fd); /* never reached*/ out: if (ret < 0) @@ -437,7 +407,6 @@ err: static int init_afs(int argc, char **argv) { int ret, afs_server_socket[2]; - pid_t afs_pid; char c; ret = socketpair(PF_UNIX, SOCK_STREAM, 0, afs_server_socket); @@ -451,14 +420,14 @@ static int init_afs(int argc, char **argv) if (afs_pid == 0) { /* child (afs) */ int i; + afs_pid = getpid(); for (i = argc - 1; i >= 0; i--) memset(argv[i], 0, strlen(argv[i])); i = argc - lls_num_inputs(cmdline_lpr) - 1; sprintf(argv[i], "para_server (afs)"); close(afs_server_socket[0]); - afs_init(afs_socket_cookie, afs_server_socket[1]); + afs_init(afs_server_socket[1]); } - mmd->afs_pid = afs_pid; close(afs_server_socket[1]); if (read(afs_server_socket[0], &c, 1) <= 0) { PARA_EMERG_LOG("early afs exit\n"); @@ -534,7 +503,7 @@ static void server_init(int argc, char **argv) init_signal_task(); para_unblock_signal(SIGCHLD); PARA_NOTICE_LOG("initializing virtual streaming system\n"); - init_vss_task(afs_socket, &sched); + vss_init(afs_socket, &sched); init_server_command_task(argc, argv); if (daemon_pipe >= 0) { if (write(daemon_pipe, "\0", 1) < 0) {