Handle sender commands in vss_post_select().

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index 93de8cc35d26c4e9f0e2277a236f47de905d5a6a..a287890c4ca20c248c681d79038ad5f378b9d858 100644 (file)
--- a/server.c
+++ b/server.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * 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.
  *     - 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:
  *
  *
  * Low-level data structures:
  *


@@ -76,12 +77,12 @@
 #include "vss.h"
 #include "config.h"
 #include "close_on_fork.h"
 #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 "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"
 #include "sched.h"
 #include "signal.h"
 #include "user_list.h"


@@ -204,7 +205,7 @@ static void shm_init(void)
        mmd->sender_cmd_data.cmd_num = -1;
        return;
 err_out:
        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);
 }
 
        exit(EXIT_FAILURE);
 }
 


@@ -256,18 +257,13 @@ static void parse_config(int override)
                struct server_cmdline_parser_params params = {
                        .override = override,
                        .initialize = 0,
                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, &params);
                conf.daemon_given = tmp;
        }
                };
                server_cmdline_parser_config_file(cf, &conf, &params);
                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;
        if (conf.logfile_given)
                logfile = open_log(conf.logfile_arg);
        ret = 1;


@@ -283,22 +279,26 @@ out:
 
 static void setup_signal_handling(void)
 {
 
 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");
 
        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);
-       signal(SIGPIPE, SIG_IGN);
-       signal(SIGUSR1, SIG_IGN);
-       if (ret != 4) {
-               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);
        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 unsigned init_network(void)


@@ -314,31 +314,36 @@ static unsigned init_network(void)
        add_close_on_fork_list(fd); /* child doesn't need the listener */
        return fd;
 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)
 {
        exit(EXIT_FAILURE);
 }
 
 static void init_random_seed(void)
 {

-       int fd, ret = -1;

        unsigned int seed;
        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;
                goto out;

-       ret = -2;
-       if (read(fd, &seed, len) != len)
+       }
+       if (ret != sizeof(seed)) {
+               ret = -ERRNO_TO_PARA_ERROR(EIO);

                goto out;
                goto out;

+       }

        srandom(seed);
        ret = 1;
 out:
        srandom(seed);
        ret = 1;
 out:

-       if (fd >= 0)
-               close(fd);
-       if (ret > 0)
+       close(fd);
+       if (ret >= 0)

                return;
                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);
 }
 
        exit(EXIT_FAILURE);
 }
 


@@ -371,15 +376,20 @@ static void init_afs(void)
                (unsigned) afs_socket_cookie);
 }
 
                (unsigned) afs_socket_cookie);
 }
 

-

 static unsigned server_init(int argc, char **argv)
 {
        /* connector's address information */
        int sockfd;
 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 */
        init_random_seed();
        /* parse command line options */

-       server_cmdline_parser(argc, argv, &conf);
+       server_cmdline_parser_ext(argc, argv, &conf, &params);

        HANDLE_VERSION_FLAG("server", conf);
        para_drop_privileges(conf.user_arg, conf.group_arg);
        /* parse config file, open log and set defaults */
        HANDLE_VERSION_FLAG("server", conf);
        para_drop_privileges(conf.user_arg, conf.group_arg);
        /* parse config file, open log and set defaults */


@@ -394,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");
        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();
        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");
        mmd_lock();
        /* init network socket */
        PARA_NOTICE_LOG("initializing tcp command socket\n");


@@ -412,7 +422,7 @@ static unsigned server_init(int argc, char **argv)
  */
 static void handle_sighup(void)
 {
  */
 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 */
        close_log(logfile); /* gets reopened if necessary by parse_config */
        logfile = NULL;
        parse_config(1); /* reopens log */


@@ -474,27 +484,12 @@ repeat:
        para_fd_set(signal_pipe, &rfds, &max_fileno);
        timeout = vss_preselect(&rfds, &wfds, &max_fileno);
        status_refresh();
        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();
        mmd_unlock();
        ret = para_select(max_fileno + 1, &rfds, &wfds, timeout);
        mmd_lock();

-       vss_post_select(&rfds, &wfds);

        if (ret < 0)
                goto repeat;
        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;
        status_refresh();
        if (FD_ISSET(signal_pipe, &rfds)) {
                int sig;


@@ -528,14 +523,6 @@ genocide:
                        exit(EXIT_FAILURE);
                }
        }
                        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;
 
        if (!FD_ISSET(sockfd, &rfds))
                goto repeat;
 


@@ -549,7 +536,7 @@ genocide:
        random();
        chld_pid = fork();
        if (chld_pid < 0) {
        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) {
                goto repeat;
        }
        if (chld_pid) {