introduce mark_fd_nonblock()

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index 3f5570dd227621eec47a07394e87de1c7ebe9dad..8f0500965ca1461dbe4d661ff4086ed95793cad9 100644 (file)
--- a/server.c
+++ b/server.c
@@ -41,6 +41,7 @@
 #include "daemon.h"
 #include "string.h"
 #include "ipc.h"
+#include "fd.h"
 
 /** define the array of error lists needed by para_server */
 INIT_SERVER_ERRLISTS;
@@ -57,20 +58,21 @@ struct misc_meta_data *mmd;
 */
 struct gengetopt_args_info conf;
 char *user_list = NULL;
+extern void dccp_send_init(struct sender *);
 extern void http_send_init(struct sender *);
 extern void ortp_send_init(struct sender *);
 extern struct audio_format afl[];
 
 /** the list of supported audio file selectors */
-struct audio_file_selector dblist[] = {
+struct audio_file_selector selectors[] = {
        {
                .name = "random",
                .init = random_selector_init,
                .update_audio_file = NULL,
        },
        {
-               .name = "plm",
-               .init = plm_selector_init,
+               .name = "playlist",
+               .init = playlist_selector_init,
                .update_audio_file = NULL,
                .pre_select = NULL,
                .post_select = NULL,
@@ -95,6 +97,10 @@ struct sender senders[] = {
                .name = "http",
                .init = http_send_init,
        },
+       {
+               .name = "dccp",
+               .init = dccp_send_init,
+       },
 #ifdef HAVE_ORTP
        {
                .name = "ortp",
@@ -118,7 +124,7 @@ static int signal_pipe;
  * \param ll the log level
  * \param fmt the format string describing the log message
  */
-void para_log(int ll, char* fmt,...)
+void para_log(int ll, const char* fmt,...)
 {
        va_list argp;
        FILE *outfd;
@@ -174,7 +180,7 @@ static void shm_init(void)
                goto err_out;
        mmd_mutex = ret;
 
-       mmd->dbt_num = 0;
+       mmd->selector_num = 0;
        mmd->num_played = 0;
        mmd->num_commands = 0;
        mmd->events = 0;
@@ -263,7 +269,6 @@ static void setup_signal_handling(void)
        int ret = 0;
 
        signal_pipe = para_signal_init();
-//     fcntl(signal_pipe, F_SETFL, O_NONBLOCK);
        PARA_NOTICE_LOG("%s", "setting up signal handlers\n");
        ret += para_install_sighandler(SIGINT);
        ret += para_install_sighandler(SIGTERM);
@@ -281,26 +286,26 @@ static void init_selector(void)
 {
        int i, ret;
 
-       mmd->dbt_change = -1; /* no change nec., set to new dbt num by com_cdt */
+       mmd->selector_change = -1; /* no change nec., set to new num by com_chs */
        if (!conf.selector_given)
                goto random;
-       for (i = 0; dblist[i].name; i++) {
-               if (strcmp(dblist[i].name, conf.selector_arg))
+       for (i = 0; selectors[i].name; i++) {
+               if (strcmp(selectors[i].name, conf.selector_arg))
                        continue;
                PARA_NOTICE_LOG("initializing %s audio file selector\n",
-                       dblist[i].name);
-               ret = dblist[i].init(&dblist[i]);
+                       selectors[i].name);
+               ret = selectors[i].init(&selectors[i]);
                if (ret < 0) {
                        PARA_WARNING_LOG("%s", PARA_STRERROR(-ret));
                        break;
                }
-               mmd->dbt_num = i;
+               mmd->selector_num = i;
                return;
        }
        PARA_WARNING_LOG("%s", "falling back to the random selector\n");
 random:
-       mmd->dbt_num = 0;
-       dblist[0].init(&dblist[0]); /* always successful */
+       mmd->selector_num = 0;
+       selectors[0].init(&selectors[0]); /* always successful */
 }
 
 static unsigned init_network(void)
@@ -317,7 +322,7 @@ static void init_random_seed(void)
        int fd, ret = -1, len = sizeof(unsigned int);
        unsigned int seed;
 
-       fd = open("/dev/random", O_RDONLY);
+       fd = open("/dev/urandom", O_RDONLY);
        if (fd < 0)
                goto out;
        ret = -2;
@@ -370,21 +375,21 @@ static unsigned do_inits(int argc, char **argv)
        return sockfd;
 }
 
-static void handle_dbt_change(void)
+static void change_selector(void)
 {
-       int ret, old = mmd->dbt_num, new = mmd->dbt_change;
+       int ret, old = mmd->selector_num, new = mmd->selector_change;
 
-       dblist[old].shutdown();
-       ret = dblist[new].init(&dblist[new]);
-       mmd->dbt_change = -1; /* reset */
+       selectors[old].shutdown();
+       ret = selectors[new].init(&selectors[new]);
+       mmd->selector_change = -1; /* reset */
        if (ret >= 0) {
-               mmd->dbt_num = new;
+               mmd->selector_num = new;
                return;
        }
        /* init failed */
        PARA_ERROR_LOG("%s -- switching to the random selector\n", PARA_STRERROR(-ret));
-       dblist[0].init(&dblist[0]);
-       mmd->dbt_num = 0;
+       selectors[0].init(&selectors[0]);
+       mmd->selector_num = 0;
 }
 
 /*
@@ -396,8 +401,8 @@ static void handle_sighup(void)
        close_log(logfile); /* gets reopened if necessary by parse_config */
        logfile = NULL;
        parse_config(1); /* reopens log */
-       mmd->dbt_change = mmd->dbt_num; /* do not change selector */
-       handle_dbt_change(); /* reload selector */
+       mmd->selector_change = mmd->selector_num; /* do not change selector.. */
+       change_selector(); /* .. just reload */
 }
 
 static void status_refresh(void)
@@ -431,7 +436,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;
-       int err, i, max_fileno, ret;
+       int i, max_fileno, ret;
        pid_t chld_pid;
        fd_set rfds, wfds;
        struct timeval *timeout;
@@ -459,26 +464,19 @@ repeat:
                        &max_fileno,
                        &rfds, &wfds);
        }
-       if (dblist[mmd->dbt_num].pre_select) {
-               ret = dblist[mmd->dbt_num].pre_select(&rfds, &wfds);
+       if (selectors[mmd->selector_num].pre_select) {
+               ret = selectors[mmd->selector_num].pre_select(&rfds, &wfds);
                max_fileno = MAX(max_fileno, ret);
        }
        mmd_unlock();
-//     PARA_DEBUG_LOG("%s: select (max = %i)\n", __func__, max_fileno);
-       ret = select(max_fileno + 1, &rfds, &wfds, NULL, timeout);
-       err = errno;
-       //PARA_DEBUG_LOG("%s: select returned  %i\n", __func__, ret);
+       ret = para_select(max_fileno + 1, &rfds, &wfds, timeout);
        mmd_lock();
-       if (mmd->dbt_change >= 0)
-               handle_dbt_change();
-       if (dblist[mmd->dbt_num].post_select)
-               dblist[mmd->dbt_num].post_select(&rfds, &wfds);
-       if (ret < 0 && err == EINTR)
-               goto repeat;
-       if (ret < 0) {
-               PARA_CRIT_LOG("select error (%s)\n", strerror(err));
+       if (mmd->selector_change >= 0)
+               change_selector();
+       if (selectors[mmd->selector_num].post_select)
+               selectors[mmd->selector_num].post_select(&rfds, &wfds);
+       if (ret < 0)
                goto repeat;
-       }
        for (i = 0; senders[i].name; i++) {
                if (senders[i].status != SENDER_ON)
                        continue;
@@ -507,7 +505,7 @@ repeat:
                case SIGTERM:
                        PARA_EMERG_LOG("terminating on signal %d\n", sig);
                        kill(0, SIGTERM);
-                       dblist[mmd->dbt_num].shutdown();
+                       selectors[mmd->selector_num].shutdown();
                        mutex_destroy(mmd_mutex);
                        shm_detach(mmd);
                        shm_destroy(mmd_shm_id);