Fix a typo on the Documentation web page.

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index 80cc8f46e36a6e70be2ed13da7bfcce6f5d5a27d..aa8fdda5425dae48dc6b47a8009795603bbefcd3 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.
  */
@@ -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);
@@ -204,7 +205,7 @@ static void shm_init(void)
        mmd->sender_cmd_data.cmd_num = -1;
        return;
 err_out:
-       PARA_EMERG_LOG("%s", PARA_STRERROR(-ret));
+       PARA_EMERG_LOG("%s", para_strerror(-ret));
        exit(EXIT_FAILURE);
 }
 
@@ -283,22 +284,26 @@ 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)
@@ -314,7 +319,7 @@ static unsigned init_network(void)
        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);
 }
 
@@ -394,11 +399,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");
@@ -475,8 +480,6 @@ repeat:
        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);
@@ -488,8 +491,6 @@ 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);