Get rid of sender->status.

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index 1022035ff0b7237cfa9508f20a16468a95666726..f6bc07d6de9e9747b5e10f84f28539e9624998d2 100644 (file)
--- a/server.c
+++ b/server.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:
  *
@@ -398,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");
@@ -479,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);
@@ -492,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);