X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=caeeba420eb55b8b2775f671b064dfb9b1dee181;hp=bb80738634d9fb68027e344521b2c806876a9f75;hb=2b471378b49c04db7bb84d1e75db981f91ad93db;hpb=89b30ef7b5ee1bb73b8efa3ccbb53c229066439e diff --git a/server.c b/server.c index bb807386..caeeba42 100644 --- a/server.c +++ b/server.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2007 Andre Noll + * Copyright (C) 1997-2008 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -51,6 +51,7 @@ * - The object storage layer: \ref osl.c, * - Blob tables: \ref blob.c, * - The error subssystem: \ref error.h. + * - Access control for paraslash senders: \ref acl.c, \ref acl.h. * * Low-level data structures: * @@ -76,12 +77,12 @@ #include "vss.h" #include "config.h" #include "close_on_fork.h" +#include "list.h" #include "send.h" #include "net.h" #include "daemon.h" #include "ipc.h" #include "fd.h" -#include "list.h" #include "sched.h" #include "signal.h" #include "user_list.h" @@ -109,37 +110,23 @@ 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 *); - -/** the list of supported senders */ -struct sender senders[] = { - { - .name = "http", - .init = http_send_init, - }, - { - .name = "dccp", - .init = dccp_send_init, - }, -#ifdef HAVE_ORTP - { - .name = "ortp", - .init = ortp_send_init, - }, -#endif - { - .name = NULL, - } -}; - - /* global variables for server-internal use */ static FILE *logfile; static int mmd_mutex, mmd_shm_id; static int signal_pipe; +struct server_command_task { + /** TCP port on which para_server listens for connections. */ + int listen_fd; + /** Copied from para_server's main function. */ + int argc; + /** Argument vector passed to para_server's main function. */ + char **argv; + /** The command task structure for scheduling. */ + //struct task task; + char dummy; +}; + /** * para_server's log function * @@ -166,7 +153,7 @@ void para_log(int ll, const char* fmt,...) fprintf(outfd, "%i: ", ll); mypid = getpid(); if (conf.loglevel_arg <= INFO) - fprintf(outfd, "(%d) ", mypid); + fprintf(outfd, "(%d) ", (int)mypid); va_start(argp, fmt); vfprintf(outfd, fmt, argp); va_end(argp); @@ -201,10 +188,9 @@ static void shm_init(void) mmd->active_connections = 0; mmd->vss_status_flags = VSS_NEXT; mmd->new_vss_status_flags = VSS_NEXT; - mmd->sender_cmd_data.cmd_num = -1; return; err_out: - PARA_EMERG_LOG("%s", PARA_STRERROR(-ret)); + PARA_EMERG_LOG("%s\n", para_strerror(-ret)); exit(EXIT_FAILURE); } @@ -256,18 +242,13 @@ static void parse_config(int override) struct server_cmdline_parser_params params = { .override = override, .initialize = 0, - .check_required = 0, - .check_ambiguity = 0 + .check_required = 1, + .check_ambiguity = 0, + .print_errors = 1 }; server_cmdline_parser_config_file(cf, &conf, ¶ms); conf.daemon_given = tmp; } - /* logfile */ - if (!conf.logfile_given && conf.daemon_given) { - ret = -1; - PARA_EMERG_LOG("%s", "daemon, but no log file\n"); - goto out; - } if (conf.logfile_given) logfile = open_log(conf.logfile_arg); ret = 1; @@ -283,62 +264,73 @@ out: static void setup_signal_handling(void) { - int ret = 0; - - signal_pipe = para_signal_init(); + signal_pipe = para_signal_init(); /* always successful */ PARA_NOTICE_LOG("setting up signal handlers\n"); - ret += para_install_sighandler(SIGINT); - ret += para_install_sighandler(SIGTERM); - ret += para_install_sighandler(SIGHUP); - ret += para_install_sighandler(SIGCHLD); - ret += para_install_sighandler(SIGUSR1); - signal(SIGPIPE, SIG_IGN); - if (ret != 5) { - PARA_EMERG_LOG("%s", "could not install signal handlers\n"); - exit(EXIT_FAILURE); - } + if (para_install_sighandler(SIGINT) < 0) + goto err; + if (para_install_sighandler(SIGTERM) < 0) + goto err; + if (para_install_sighandler(SIGHUP) < 0) + goto err; + if (para_install_sighandler(SIGCHLD) < 0) + goto err; + if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) + goto err; + if (signal(SIGUSR1, SIG_IGN) == SIG_ERR) + goto err; add_close_on_fork_list(signal_pipe); + return; +err: + PARA_EMERG_LOG("could not install signal handlers\n"); + exit(EXIT_FAILURE); } -static unsigned init_network(void) +static void init_command_task(struct server_command_task *sct) { - int fd, ret = init_tcp_socket(conf.port_arg); + int ret; + PARA_NOTICE_LOG("initializing tcp command socket\n"); + ret = para_listen(AF_UNSPEC, IPPROTO_TCP, conf.port_arg); if (ret < 0) goto err; - fd = ret; - ret = mark_fd_nonblocking(fd); + sct->listen_fd = ret; + ret = mark_fd_nonblocking(sct->listen_fd); if (ret < 0) goto err; - add_close_on_fork_list(fd); /* child doesn't need the listener */ - return fd; + add_close_on_fork_list(sct->listen_fd); /* child doesn't need the listener */ + return; err: - PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_EMERG_LOG("%s\n", para_strerror(-ret)); exit(EXIT_FAILURE); } static void init_random_seed(void) { - int fd, ret = -1; unsigned int seed; - size_t len = sizeof(unsigned int); + int fd, ret = para_open("/dev/urandom", O_RDONLY, 0); - fd = open("/dev/urandom", O_RDONLY); - if (fd < 0) + if (ret < 0) + goto err; + fd = ret; + ret = read(fd, &seed, sizeof(seed)); + if (ret < 0) { + ret = -ERRNO_TO_PARA_ERROR(errno); goto out; - ret = -2; - if (read(fd, &seed, len) != len) + } + if (ret != sizeof(seed)) { + ret = -ERRNO_TO_PARA_ERROR(EIO); goto out; + } srandom(seed); ret = 1; out: - if (fd >= 0) - close(fd); - if (ret > 0) + close(fd); + if (ret >= 0) return; - PARA_EMERG_LOG("can not seed pseudo random generator (ret = %d)\n", - ret); +err: + PARA_EMERG_LOG("can not seed pseudo random number generator: %s\n", + para_strerror(-ret)); exit(EXIT_FAILURE); } @@ -371,15 +363,19 @@ static void init_afs(void) (unsigned) afs_socket_cookie); } - -static unsigned server_init(int argc, char **argv) +static void server_init(int argc, char **argv) { /* connector's address information */ - int sockfd; - + struct server_cmdline_parser_params params = { + .override = 0, + .initialize = 1, + .check_required = 0, + .check_ambiguity = 0, + .print_errors = 1 + }; init_random_seed(); /* parse command line options */ - server_cmdline_parser(argc, argv, &conf); + server_cmdline_parser_ext(argc, argv, &conf, ¶ms); HANDLE_VERSION_FLAG("server", conf); para_drop_privileges(conf.user_arg, conf.group_arg); /* parse config file, open log and set defaults */ @@ -393,18 +389,14 @@ static unsigned server_init(int argc, char **argv) daemon_init(); PARA_NOTICE_LOG("initializing audio format handlers\n"); afh_init(); - PARA_NOTICE_LOG("initializing virtual streaming system\n"); - vss_init(); mmd->server_pid = getpid(); setup_signal_handling(); PARA_NOTICE_LOG("initializing the audio file selector\n"); init_afs(); + PARA_NOTICE_LOG("initializing virtual streaming system\n"); + vss_init(); mmd_lock(); - /* init network socket */ - PARA_NOTICE_LOG("initializing tcp command socket\n"); - sockfd = init_network(); PARA_NOTICE_LOG("server init complete\n"); - return sockfd; } /* @@ -412,7 +404,7 @@ static unsigned server_init(int argc, char **argv) */ static void handle_sighup(void) { - PARA_NOTICE_LOG("%s", "SIGHUP\n"); + PARA_NOTICE_LOG("SIGHUP\n"); close_log(logfile); /* gets reopened if necessary by parse_config */ logfile = NULL; parse_config(1); /* reopens log */ @@ -444,6 +436,69 @@ out: } } +static int server_select(int max_fileno, fd_set *readfds, fd_set *writefds, + struct timeval *timeout_tv) +{ + int ret; + + status_refresh(); + mmd_unlock(); + ret = para_select(max_fileno + 1, readfds, writefds, timeout_tv); + mmd_lock(); + return ret; +} + +static void command_pre_select(int *max_fileno, fd_set *rfds, char *dummy_ptr) +{ + struct server_command_task *sct = container_of(dummy_ptr, struct server_command_task, dummy); + para_fd_set(sct->listen_fd, rfds, max_fileno); +} + +static void command_post_select(fd_set *rfds, char *dummy_ptr) +{ + struct server_command_task *sct = container_of(dummy_ptr, struct server_command_task, dummy); + + int new_fd, ret; + char *peer_name; + pid_t child_pid; + + if (!FD_ISSET(sct->listen_fd, rfds)) + return; + ret = para_accept(sct->listen_fd, NULL, 0); + if (ret < 0) + goto out; + new_fd = ret; + peer_name = remote_name(new_fd); + PARA_INFO_LOG("got connection from %s, forking\n", peer_name); + mmd->num_connects++; + mmd->active_connections++; + random(); + child_pid = fork(); + if (child_pid < 0) { + ret = -ERRNO_TO_PARA_ERROR(errno); + goto out; + } + if (child_pid) { + close(new_fd); + /* parent keeps accepting connections */ + return; + } + alarm(ALARM_TIMEOUT); + close_listed_fds(); + para_signal_shutdown(); + /* + * put info on who we are serving into argv[0] to make + * client ip visible in top/ps + */ +// for (i = argc - 1; i >= 0; i--) +// memset(argv[i], 0, strlen(argv[i])); +// sprintf(argv[0], "para_server (serving %s)", peer_name); + return handle_connect(new_fd, peer_name); +out: + if (ret < 0) + PARA_CRIT_LOG("%s\n", para_strerror(-ret)); +} + /** * the main function of para_server * @@ -455,47 +510,24 @@ out: */ 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 i, max_fileno, ret; - pid_t chld_pid; + int max_fileno, ret; fd_set rfds, wfds; struct timeval *timeout; + struct server_command_task server_command_task_struct; + valid_fd_012(); - sockfd = server_init(argc, argv); + server_init(argc, argv); + init_command_task(&server_command_task_struct); repeat: FD_ZERO(&rfds); FD_ZERO(&wfds); max_fileno = -1; - /* check socket and signal pipe in any case */ - para_fd_set(sockfd, &rfds, &max_fileno); + command_pre_select(&max_fileno, &rfds, &server_command_task_struct.dummy); para_fd_set(signal_pipe, &rfds, &max_fileno); timeout = vss_preselect(&rfds, &wfds, &max_fileno); - 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(&max_fileno, &rfds, &wfds); - } - mmd_unlock(); - ret = para_select(max_fileno + 1, &rfds, &wfds, timeout); - mmd_lock(); + server_select(max_fileno + 1, &rfds, &wfds, timeout); vss_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(&rfds, &wfds); - } - vss_send_chunk(); - status_refresh(); if (FD_ISSET(signal_pipe, &rfds)) { int sig; pid_t pid; @@ -528,45 +560,6 @@ genocide: exit(EXIT_FAILURE); } } - if (mmd->sender_cmd_data.cmd_num >= 0) { - int num = mmd->sender_cmd_data.cmd_num, - s = mmd->sender_cmd_data.sender_num; - - if (senders[s].client_cmds[num]) - senders[s].client_cmds[num](&mmd->sender_cmd_data); - mmd->sender_cmd_data.cmd_num = -1; - } - if (!FD_ISSET(sockfd, &rfds)) - goto repeat; - - new_fd = para_accept(sockfd, &their_addr, sizeof(struct sockaddr_in)); - if (new_fd < 0) - goto repeat; - PARA_INFO_LOG("got connection from %s, forking\n", - inet_ntoa(their_addr.sin_addr)); - mmd->num_connects++; - mmd->active_connections++; - random(); - chld_pid = fork(); - if (chld_pid < 0) { - PARA_CRIT_LOG("%s", "fork failed\n"); - goto repeat; - } - if (chld_pid) { - close(new_fd); - /* parent keeps accepting connections */ - goto repeat; - } - alarm(ALARM_TIMEOUT); - close_listed_fds(); - para_signal_shutdown(); - /* - * put info on who we are serving into argv[0] to make - * client ip visible in top/ps - */ - for (i = argc - 1; i >= 0; i--) - memset(argv[i], 0, strlen(argv[i])); - sprintf(argv[0], "para_server (serving %s)", - inet_ntoa(their_addr.sin_addr)); - return handle_connect(new_fd, &their_addr); + command_post_select(&rfds, &server_command_task_struct.dummy); + goto repeat; }