More audiod fixes

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index 73b8b057cfe6071535733292bde293986f72930d..2391e07c360d93f68e85a76c99bc783e1f2d4bc0 100644 (file)
--- a/server.c
+++ b/server.c
@@ -21,8 +21,9 @@
 
 /** \mainpage Paraslash API Reference
  *
 
 /** \mainpage Paraslash API Reference
  *

- *  Good starting points for reading are probably \ref dbtool, \ref sender,
- *  \ref receiver, \ref receiver_node, \ref filter, \ref filter_node.
+ *  Good starting points for reading are probably \ref audio_file_selector,
+ *  \ref sender, \ref receiver, \ref receiver_node, \ref filter, \ref
+ *  filter_node.

  *
  */
 
  *
  */
 


@@ -34,12 +35,13 @@
 #include "afs.h"
 #include "config.h"
 #include "close_on_fork.h"
 #include "afs.h"
 #include "config.h"
 #include "close_on_fork.h"

-#include <sys/mman.h> /* MAP_SHARED, PROT_READ, PROT_WRITE */

 #include "send.h"
 #include "error.h"
 #include "net.h"
 #include "daemon.h"
 #include "string.h"
 #include "send.h"
 #include "error.h"
 #include "net.h"
 #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;
 
 /** define the array of error lists needed by para_server */
 INIT_SERVER_ERRLISTS;


@@ -47,36 +49,41 @@ INIT_SERVER_ERRLISTS;
 /** shut down non-authorized connections after that many seconds */
 #define ALARM_TIMEOUT 10
 
 /** shut down non-authorized connections after that many seconds */
 #define ALARM_TIMEOUT 10
 

-/* these are exported to afs/command/dbtool */
+/* these are exported to afs.c. command.c and to all selectors */

 struct misc_meta_data *mmd;
 /** the configuration of para_server
  *
 struct misc_meta_data *mmd;
 /** the configuration of para_server
  *

- * It also contains the options for all database tools and all supported
+ * It also contains the options for all audio file selectors and all supported

  * senders.
 */
 struct gengetopt_args_info conf;
 char *user_list = NULL;
  * senders.
 */
 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 void http_send_init(struct sender *);
 extern void ortp_send_init(struct sender *);

-extern struct audio_format afl[];

 
 

-/** the list of supported database tools */
-struct dbtool dblist[] = {
+/* TODO: This is better handled by autoconf */
+/** the list of supported audio file selectors */
+struct audio_file_selector selectors[] = {

        {
                .name = "random",
        {
                .name = "random",

-               .init = random_dbtool_init,
+               .init = random_selector_init,

                .update_audio_file = NULL,
        },
        {
                .update_audio_file = NULL,
        },
        {

-               .name = "plm",
-               .init = plm_dbtool_init,
+               .name = "playlist",
+               .init = playlist_selector_init,

                .update_audio_file = NULL,
                .update_audio_file = NULL,

+               .pre_select = NULL,
+               .post_select = NULL,

        },
 #ifdef HAVE_MYSQL
        {
                .name = "mysql",
        },
 #ifdef HAVE_MYSQL
        {
                .name = "mysql",

-               .init = mysql_dbtool_init,
+               .init = mysql_selector_init,

                .update_audio_file = NULL,
                .update_audio_file = NULL,

+               .pre_select = NULL,
+               .post_select = NULL,

        },
 #endif
        {
        },
 #endif
        {


@@ -90,6 +97,10 @@ struct sender senders[] = {
                .name = "http",
                .init = http_send_init,
        },
                .name = "http",
                .init = http_send_init,
        },

+       {
+               .name = "dccp",
+               .init = dccp_send_init,
+       },

 #ifdef HAVE_ORTP
        {
                .name = "ortp",
 #ifdef HAVE_ORTP
        {
                .name = "ortp",


@@ -104,7 +115,7 @@ struct sender senders[] = {
 
 /* global variables for server-internal use */
 static FILE *logfile;
 
 /* global variables for server-internal use */
 static FILE *logfile;

-static int mmd_semid;
+static int mmd_mutex, mmd_shm_id;

 static int signal_pipe;
 
 /**
 static int signal_pipe;
 
 /**


@@ -113,7 +124,7 @@ static int signal_pipe;
  * \param ll the log level
  * \param fmt the format string describing the log message
  */
  * \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;
 {
        va_list argp;
        FILE *outfd;


@@ -124,15 +135,7 @@ void para_log(int ll, char* fmt,...)
 
        if (ll < conf.loglevel_arg)
                return;
 
        if (ll < conf.loglevel_arg)
                return;

-       if (!logfile) {
-               if (ll < WARNING)
-                       outfd = stdout;
-               else
-                       outfd = stderr;
-       } else
-               outfd = logfile;
-       if (conf.daemon_given && !logfile)
-               return;
+       outfd = logfile? logfile : stderr;

        time(&t1);
        tm = localtime(&t1);
        strftime(str, MAXLINE, "%b %d %H:%M:%S", tm);
        time(&t1);
        tm = localtime(&t1);
        strftime(str, MAXLINE, "%b %d %H:%M:%S", tm);


@@ -147,29 +150,29 @@ void para_log(int ll, char* fmt,...)
        va_end(argp);
 }
 
        va_end(argp);
 }
 

-

 /*
 /*

- * setup shared memory area and get semaphore for locking
+ * setup shared memory area and get mutex for locking

  */
 static void shm_init(void)
 {
  */
 static void shm_init(void)
 {

-       int fd;
-       caddr_t area;
+       void *shm;
+       int ret = shm_new(sizeof(struct misc_meta_data));

 
 

-       if ((fd = open("/dev/zero", O_RDWR)) < 0) {
-               PARA_EMERG_LOG("%s", "failed to open /dev/zero\n");
-               exit(EXIT_FAILURE);
-       }
-       if ((area = mmap(0, sizeof(struct misc_meta_data),
-                       PROT_READ | PROT_WRITE,
-                       MAP_SHARED, fd, 0)) == (caddr_t) - 1) {
-               PARA_EMERG_LOG("%s", "mmap error\n");
-               exit(EXIT_FAILURE);
-       }
-       close(fd); /* we dont need /dev/zero anymore */
-       mmd = (struct misc_meta_data *)area;
+       if (ret < 0)
+               goto err_out;
+
+       ret = shm_attach(ret, ATTACH_RW, &shm);
+       if (ret < 0)
+               goto err_out;
+       mmd = shm;
+       mmd_shm_id = ret;

 
 

-       mmd->dbt_num = 0;
+       ret = mutex_new();
+       if (ret < 0)
+               goto err_out;
+       mmd_mutex = ret;
+
+       mmd->selector_num = 0;

        mmd->num_played = 0;
        mmd->num_commands = 0;
        mmd->events = 0;
        mmd->num_played = 0;
        mmd->num_commands = 0;
        mmd->events = 0;


@@ -180,21 +183,10 @@ static void shm_init(void)
        mmd->afs_status_flags = AFS_NEXT;
        mmd->new_afs_status_flags = AFS_NEXT;
        mmd->sender_cmd_data.cmd_num = -1;
        mmd->afs_status_flags = AFS_NEXT;
        mmd->new_afs_status_flags = AFS_NEXT;
        mmd->sender_cmd_data.cmd_num = -1;

-
-       mmd_semid = semget(42, 1, IPC_CREAT | 0666);
-       if (mmd_semid == -1) {
-               PARA_EMERG_LOG("%s", "semget failed\n");
-               exit(EXIT_FAILURE);
-       }
-}
-
-static void do_semop(struct sembuf *sops, int num)
-{
-       if (semop(mmd_semid, sops, num) >= 0)
-               return;
-       PARA_WARNING_LOG("semop failed (%s), retrying\n", strerror(errno));
-       while (semop(mmd_semid, sops, num) < 0)
-               ; /* nothing */
+       return;
+err_out:
+       PARA_EMERG_LOG("%s", PARA_STRERROR(-ret));
+       exit(EXIT_FAILURE);

 }
 
 /**
 }
 
 /**


@@ -204,19 +196,7 @@ static void do_semop(struct sembuf *sops, int num)
  */
 void mmd_lock(void)
 {
  */
 void mmd_lock(void)
 {

-       struct sembuf sops[2] = {
-               {
-                       .sem_num = 0,
-                       .sem_op = 0,
-                       .sem_flg = SEM_UNDO
-               },
-               {
-                       .sem_num = 0,
-                       .sem_op = 1,
-                       .sem_flg = SEM_UNDO
-               }
-       };
-       do_semop(sops, 2);
+       mutex_lock(mmd_mutex);

 }
 
 /**
 }
 
 /**


@@ -224,16 +204,10 @@ void mmd_lock(void)
  *
  * \sa semop(2), struct misc_meta_data
  */
  *
  * \sa semop(2), struct misc_meta_data
  */

+

 void mmd_unlock(void)
 {
 void mmd_unlock(void)
 {

-       struct sembuf sops[1] = {
-               {
-                       .sem_num = 0,
-                       .sem_op = -1,
-                       .sem_flg = SEM_UNDO
-               },
-       };
-       do_semop(sops, 1);
+       mutex_unlock(mmd_mutex);

 }
 
 static void parse_config(int override)
 }
 
 static void parse_config(int override)


@@ -287,60 +261,43 @@ static void setup_signal_handling(void)
        int ret = 0;
 
        signal_pipe = para_signal_init();
        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);
        ret += para_install_sighandler(SIGHUP);
        ret += para_install_sighandler(SIGCHLD);
        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);
        signal(SIGPIPE, SIG_IGN);

-       signal(SIGUSR1, SIG_IGN);
-       if (ret != 4) {
+       if (ret != 5) {

                PARA_EMERG_LOG("%s", "could not install signal handlers\n");
                exit(EXIT_FAILURE);
        }
 }
 
                PARA_EMERG_LOG("%s", "could not install signal handlers\n");
                exit(EXIT_FAILURE);
        }
 }
 

-static void init_dbtool(void)
+static void init_selector(void)

 {
 {

-       int i;
+       int i, ret;

 
 

-       mmd->dbt_change = -1; /* no change nec., set to new dbt num by com_cdt */
-       if (!dblist[1].name)
+       mmd->selector_change = -1; /* no change nec., set to new num by com_chs */
+       if (!conf.selector_given)

                goto random;
                goto random;

-       if (conf.dbtool_given) {
-               for (i = 0; dblist[i].name; i++) {
-                       if (strcmp(dblist[i].name, conf.dbtool_arg))
-                               continue;
-                       PARA_NOTICE_LOG("initializing %s database tool\n",
-                               dblist[i].name);
-                       if (dblist[i].init(&dblist[i]) < 0) {
-                               PARA_WARNING_LOG("init %s failed",
-                                       dblist[i].name);
-                               goto random;
-                       }
-                       mmd->dbt_num = i;
-                       return;
-               }
-               PARA_WARNING_LOG("%s", "no such dbtool, switching to random\n");
-               goto random;
-       }
-       /* use the first dbtool that works
-        * (assuming that random always works)
-        */
-       for (i = 1; dblist[i].name; i++) {
-               int ret = dblist[i].init(&dblist[i]);
-               if (ret >= 0) {
-                       PARA_INFO_LOG("initialized %s\n", dblist[i].name);
-                       mmd->dbt_num = i;
-                       return;
+       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",
+                       selectors[i].name);
+               ret = selectors[i].init(&selectors[i]);
+               if (ret < 0) {
+                       PARA_WARNING_LOG("%s", PARA_STRERROR(-ret));
+                       break;

                }
                }

-               PARA_CRIT_LOG("%s init failed: %s\n", dblist[i].name,
-                       PARA_STRERROR(-ret));
+               mmd->selector_num = i;
+               return;

        }
        }

+       PARA_WARNING_LOG("%s", "falling back to the random selector\n");

 random:
 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)
 }
 
 static unsigned init_network(void)


@@ -357,7 +314,7 @@ static void init_random_seed(void)
        int fd, ret = -1, len = sizeof(unsigned int);
        unsigned int seed;
 
        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;
        if (fd < 0)
                goto out;
        ret = -2;


@@ -383,7 +340,7 @@ static unsigned do_inits(int argc, char **argv)
        init_random_seed();
        /* parse command line options */
        cmdline_parser(argc, argv, &conf);
        init_random_seed();
        /* parse command line options */
        cmdline_parser(argc, argv, &conf);

-       para_drop_privileges(conf.user_arg);
+       para_drop_privileges(conf.user_arg, conf.group_arg);

        /* parse config file, open log and set defaults */
        parse_config(0);
        log_welcome("para_server", conf.loglevel_arg);
        /* parse config file, open log and set defaults */
        parse_config(0);
        log_welcome("para_server", conf.loglevel_arg);


@@ -392,7 +349,7 @@ static unsigned do_inits(int argc, char **argv)
        /* become daemon */
        if (conf.daemon_given)
                daemon_init();
        /* become daemon */
        if (conf.daemon_given)
                daemon_init();

-       init_dbtool();
+       init_selector();

        PARA_NOTICE_LOG("%s", "initializing audio file sender\n");
        /* audio file sender */
        afs_init();
        PARA_NOTICE_LOG("%s", "initializing audio file sender\n");
        /* audio file sender */
        afs_init();


@@ -410,21 +367,21 @@ static unsigned do_inits(int argc, char **argv)
        return sockfd;
 }
 
        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) {
        if (ret >= 0) {

-               mmd->dbt_num = new;
+               mmd->selector_num = new;

                return;
        }
        /* init failed */
                return;
        }
        /* init failed */

-       PARA_ERROR_LOG("%s -- switching to the random dbtool\n", PARA_STRERROR(-ret));
-       dblist[0].init(&dblist[0]);
-       mmd->dbt_num = 0;
+       PARA_ERROR_LOG("%s -- switching to the random selector\n", PARA_STRERROR(-ret));
+       selectors[0].init(&selectors[0]);
+       mmd->selector_num = 0;

 }
 
 /*
 }
 
 /*


@@ -436,8 +393,8 @@ static void handle_sighup(void)
        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 */

-       mmd->dbt_change = mmd->dbt_num; /* do not change dbtool */
-       handle_dbt_change(); /* force reloading dbtool */
+       mmd->selector_change = mmd->selector_num; /* do not change selector.. */
+       change_selector(); /* .. just reload */

 }
 
 static void status_refresh(void)
 }
 
 static void status_refresh(void)


@@ -471,7 +428,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;
        /* 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;
        pid_t chld_pid;
        fd_set rfds, wfds;
        struct timeval *timeout;


@@ -479,14 +436,12 @@ int main(int argc, char *argv[])
        valid_fd_012();
        sockfd = do_inits(argc, argv);
 repeat:
        valid_fd_012();
        sockfd = do_inits(argc, argv);
 repeat:

-       /* check socket and signal pipe in any case */

        FD_ZERO(&rfds);
        FD_ZERO(&wfds);
        FD_ZERO(&rfds);
        FD_ZERO(&wfds);

-       FD_SET(sockfd, &rfds);
-       max_fileno = sockfd;
-       FD_SET(signal_pipe, &rfds);
-       max_fileno = MAX(max_fileno, signal_pipe);
-
+       max_fileno = -1;
+       /* check socket and signal pipe in any case */
+       para_fd_set(sockfd, &rfds, &max_fileno);
+       para_fd_set(signal_pipe, &rfds, &max_fileno);

        timeout = afs_preselect();
        status_refresh();
        for (i = 0; senders[i].name; i++) {
        timeout = afs_preselect();
        status_refresh();
        for (i = 0; senders[i].name; i++) {


@@ -494,38 +449,30 @@ repeat:
                        continue;
                if (!senders[i].pre_select)
                        continue;
                        continue;
                if (!senders[i].pre_select)
                        continue;

-               senders[i].pre_select(mmd->audio_format >= 0?
-                       &afl[mmd->audio_format] : NULL,
-                       &max_fileno,
-                       &rfds, &wfds);
+               senders[i].pre_select( &max_fileno, &rfds, &wfds);
+       }
+       if (selectors[mmd->selector_num].pre_select) {
+               ret = selectors[mmd->selector_num].pre_select(&rfds, &wfds);
+               max_fileno = PARA_MAX(max_fileno, ret);

        }
        mmd_unlock();
        }
        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();
        mmd_lock();

-       if (mmd->dbt_change >= 0)
-               handle_dbt_change();
-       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;
                goto repeat;

-       }

        for (i = 0; senders[i].name; i++) {
                if (senders[i].status != SENDER_ON)
                        continue;
                if (!senders[i].post_select)
                        continue;
        for (i = 0; senders[i].name; i++) {
                if (senders[i].status != SENDER_ON)
                        continue;
                if (!senders[i].post_select)
                        continue;

-               senders[i].post_select(mmd->audio_format >= 0?
-                       &afl[mmd->audio_format] : NULL,
-                       &rfds, &wfds);
-       }
-       if (!ret) {
-               afs_send_chunk();
-               status_refresh();
+               senders[i].post_select(&rfds, &wfds);

        }
        }

+       afs_send_chunk();
+       status_refresh();

        if (FD_ISSET(signal_pipe, &rfds)) {
                int sig;
                sig = para_next_signal();
        if (FD_ISSET(signal_pipe, &rfds)) {
                int sig;
                sig = para_next_signal();


@@ -541,6 +488,10 @@ repeat:
                case SIGTERM:
                        PARA_EMERG_LOG("terminating on signal %d\n", sig);
                        kill(0, SIGTERM);
                case SIGTERM:
                        PARA_EMERG_LOG("terminating on signal %d\n", sig);
                        kill(0, SIGTERM);

+                       selectors[mmd->selector_num].shutdown();
+                       mutex_destroy(mmd_mutex);
+                       shm_detach(mmd);
+                       shm_destroy(mmd_shm_id);

                        exit(EXIT_FAILURE);
                }
        }
                        exit(EXIT_FAILURE);
                }
        }