X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=a287890c4ca20c248c681d79038ad5f378b9d858;hp=d8fc48eeb0f7b220e49832ccb9e1e5706c63fde0;hb=f41688f647116d0a17513cc86c60cc9729da6502;hpb=b3ee0fa979a74e9d7a1497ec5a3ac8fa7cc7472b diff --git a/server.c b/server.c index d8fc48ee..a287890c 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. */ @@ -23,8 +23,8 @@ * * The gory details, listed by topic: * - * - Audio format handlers: \ref mp3_afh.c, \ref ogg_afh.c \ref aac_afh.c, - * - Decoders: \ref mp3dec.c, \ref \ref oggdec.c, \ref aacdec.c, + * - Audio format handlers: \ref mp3_afh.c, \ref ogg_afh.c, \ref aac_afh.c, + * - Decoders: \ref mp3dec.c, \ref oggdec.c, \ref aacdec.c, * - Volume normalizer: \ref compress.c, * - Output: \ref alsa_write.c, \ref osx_write.c, * - http: \ref http_recv.c, \ref http_send.c, @@ -32,7 +32,7 @@ * - dccp: \ref dccp_recv.c, \ref dccp_send.c, * - Audio file selector: \ref afs.c, \ref aft.c, \ref mood.c, * - Afs structures: \ref afs_table, \ref audio_file_data, - * \ref afs_info \ref audio_format_info, + * \ref afs_info \ref afh_info, * - Afs tables: \ref aft.c, \ref mood.c, \ref playlist.c, * \ref attribute.c, \ref score.c, * - The virtual streaming system: \ref vss.c, \ref chunk_queue.c. @@ -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" @@ -166,7 +167,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); @@ -199,13 +200,12 @@ static void shm_init(void) mmd->events = 0; mmd->num_connects = 0; mmd->active_connections = 0; - strcpy(mmd->afd.path, "(none)"); 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); } @@ -257,18 +257,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; @@ -284,59 +279,71 @@ out: static void setup_signal_handling(void) { - int ret = 0; - - signal_pipe = para_signal_init(); - PARA_NOTICE_LOG("%s", "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); - } + signal_pipe = para_signal_init(); /* always successful */ + + PARA_NOTICE_LOG("setting up signal handlers\n"); + 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) { - int fd, ret = init_tcp_socket(conf.port_arg); + int fd, ret = para_listen(AF_UNSPEC, IPPROTO_TCP, conf.port_arg); if (ret < 0) goto err; fd = ret; - ret = mark_fd_nonblock(fd); + ret = mark_fd_nonblocking(fd); if (ret < 0) goto err; + add_close_on_fork_list(fd); /* child doesn't need the listener */ return fd; 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); } @@ -361,7 +368,7 @@ static void init_afs(void) } close(afs_server_socket[1]); afs_socket = afs_server_socket[0]; - ret = mark_fd_nonblock(afs_socket); + ret = mark_fd_nonblocking(afs_socket); if (ret < 0) exit(EXIT_FAILURE); add_close_on_fork_list(afs_socket); @@ -369,15 +376,20 @@ static void init_afs(void) (unsigned) afs_socket_cookie); } - static unsigned 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 */ @@ -392,11 +404,11 @@ static unsigned server_init(int argc, char **argv) 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(); + vss_init(); mmd_lock(); /* init network socket */ PARA_NOTICE_LOG("initializing tcp command socket\n"); @@ -410,7 +422,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 */ @@ -455,7 +467,7 @@ int main(int argc, char *argv[]) { /* listen on sock_fd, new connection on new_fd */ int sockfd, new_fd; - struct sockaddr_in their_addr; + char *peer_name; int i, max_fileno, ret; pid_t chld_pid; fd_set rfds, wfds; @@ -472,27 +484,12 @@ repeat: 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(); - 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(); + vss_post_select(&rfds, &wfds); status_refresh(); if (FD_ISSET(signal_pipe, &rfds)) { int sig; @@ -526,28 +523,20 @@ 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)); + new_fd = para_accept(sockfd, NULL, 0); if (new_fd < 0) goto repeat; - PARA_INFO_LOG("got connection from %s, forking\n", - inet_ntoa(their_addr.sin_addr)); + peer_name = remote_name(new_fd); + PARA_INFO_LOG("got connection from %s, forking\n", peer_name); mmd->num_connects++; mmd->active_connections++; random(); chld_pid = fork(); if (chld_pid < 0) { - PARA_CRIT_LOG("%s", "fork failed\n"); + PARA_CRIT_LOG("fork failed\n"); goto repeat; } if (chld_pid) { @@ -557,14 +546,13 @@ genocide: } alarm(ALARM_TIMEOUT); close_listed_fds(); - close(sockfd); /* child doesn't need the listener */ + 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); + sprintf(argv[0], "para_server (serving %s)", peer_name); + return handle_connect(new_fd, peer_name); }