client: Do not leak buffer tree node on exit.
[paraslash.git] / audiod.c
index 64ea8a51efeeb13cb65f86d1ea417120679ff2f4..6e5efd64ed38f95181faa8cb1ce1a8dadb7483e4 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -7,9 +7,7 @@
 /** \file audiod.c the paraslash's audio daemon */
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <signal.h>
-#include <openssl/rc4.h>
 #include <stdbool.h>
 
 #include "para.h"
@@ -33,6 +31,7 @@
 #include "write.h"
 #include "write_common.h"
 #include "signal.h"
+#include "version.h"
 
 /** define the array of error lists needed by para_audiod */
 INIT_AUDIOD_ERRLISTS;
@@ -167,7 +166,7 @@ struct command_task {
  * \return The audio format number on success, -E_UNSUPPORTED_AUDIO_FORMAT if
  * \a name is not a supported audio format.
  */
-int get_audio_format_num(const char *name)
+static int get_audio_format_num(const char *name)
 {
        int i;
 
@@ -179,6 +178,22 @@ int get_audio_format_num(const char *name)
        return -E_UNSUPPORTED_AUDIO_FORMAT;
 }
 
+static int get_matching_audio_format_nums(const char *re)
+{
+       int i, ret;
+       regex_t preg;
+
+       ret = para_regcomp(&preg, re, REG_EXTENDED | REG_NOSUB);
+       if (ret < 0)
+               return ret;
+       ret = 0;
+       FOR_EACH_AUDIO_FORMAT(i)
+               if (regexec(&preg, audio_formats[i], 0, NULL, 0) != REG_NOMATCH)
+                       ret |= (1 << i);
+       regfree(&preg);
+       return ret;
+}
+
 /**
  * Compute the play time based on information of the given slot.
  *
@@ -430,22 +445,15 @@ static void kill_btrn(struct btr_node *btrn, struct task *t, int error)
 
 static void kill_all_decoders(int error)
 {
-       int i, j;
+       int i;
 
        FOR_EACH_SLOT(i) {
-               struct slot_info *s = &slot[i];
-               struct audio_format_info *a;
+               struct slot_info *s = slot + i;
                if (s->format < 0)
                        continue;
-               a = afi + s->format;
-               if (s->wns)
-                       for (j = 0; j < a->num_writers; j++)
-                               kill_btrn(s->wns[j].btrn, &s->wns[j].task, error);
-               if (s->fns)
-                       for (j = 0; j < a->num_writers; j++)
-                               kill_btrn(s->fns[j].btrn, &s->wns[j].task, error);
-               if (s->receiver_node)
-                       kill_btrn(s->receiver_node->btrn, &s->receiver_node->task,
+               if (!s->receiver_node)
+                       continue;
+               kill_btrn(s->receiver_node->btrn, &s->receiver_node->task,
                                error);
        }
 }
@@ -469,20 +477,6 @@ static int get_empty_slot(void)
        return -E_NO_MORE_SLOTS;
 }
 
-/**
- * get the number of filters
- *
- * \param audio_format_num the number identifying the audio format
- *
- * \return the number of filters for the given audio format
- *
- * \sa struct filter;
- */
-int num_filters(int audio_format_num)
-{
-       return afi[audio_format_num].num_filters;
-}
-
 static void open_filters(struct slot_info *s)
 {
        struct audio_format_info *a = afi + s->format;
@@ -738,30 +732,36 @@ static int update_item(int itemnum, char *buf)
 
 static int parse_stream_command(const char *txt, char **cmd)
 {
-       char *p = strchr(txt, ':');
-       int i;
+       int ret, len;
+       char *re, *p = strchr(txt, ':');
 
        if (!p)
                return -E_MISSING_COLON;
-       p++;
-       FOR_EACH_AUDIO_FORMAT(i) {
-               if (strncmp(txt, audio_formats[i], strlen(audio_formats[i])))
-                       continue;
-               *cmd = p;
-               return i;
-       }
-       return -E_UNSUPPORTED_AUDIO_FORMAT;
+       *cmd = p + 1;
+       len = p - txt;
+       re = malloc(len + 1);
+       strncpy(re, txt, len);
+       re[len] = '\0';
+       ret = get_matching_audio_format_nums(re);
+       free(re);
+       return ret;
 }
 
 static int add_filter(int format, char *cmdline)
 {
        struct audio_format_info *a = &afi[format];
        int filter_num, nf = a->num_filters;
+       void *cfg;
 
-       filter_num = check_filter_arg(cmdline, &a->filter_conf[nf]);
+       filter_num = check_filter_arg(cmdline, &cfg);
        if (filter_num < 0)
                return filter_num;
+       a->filter_conf = para_realloc(a->filter_conf,
+               (nf + 1) * sizeof(void *));
+       a->filter_nums = para_realloc(a->filter_nums,
+               (nf + 1) * sizeof(unsigned));
        a->filter_nums[nf] = filter_num;
+       a->filter_conf[nf] = cfg;
        a->num_filters++;
        PARA_INFO_LOG("%s filter %d: %s\n", audio_formats[format], nf,
                filters[filter_num].name);
@@ -770,36 +770,35 @@ static int add_filter(int format, char *cmdline)
 
 static int parse_writer_args(void)
 {
-       int i, ret, nw;
+       int i, ret;
        char *cmd;
        struct audio_format_info *a;
 
-       nw = PARA_MAX(1U, conf.writer_given);
-       PARA_INFO_LOG("maximal number of writers: %d\n", nw);
-       FOR_EACH_AUDIO_FORMAT(i) {
-               a = &afi[i];
-               a->writer_conf = para_malloc(nw * sizeof(void *));
-               a->writer_nums = para_malloc(nw * sizeof(int));
-               a->num_writers = 0;
-       }
        for (i = 0; i < conf.writer_given; i++) {
                void *wconf;
-               int writer_num;
+               int j, nw, writer_num, af_mask;
+
                ret = parse_stream_command(conf.writer_arg[i], &cmd);
                if (ret < 0)
                        goto out;
-               a = &afi[ret];
-               nw = a->num_writers;
-               wconf = check_writer_arg(cmd, &writer_num);
-               if (!wconf) {
-                       ret = writer_num;
-                       goto out;
+               af_mask = ret;
+               FOR_EACH_AUDIO_FORMAT(j) {
+                       a = afi + j;
+                       if ((af_mask & (1 << j)) == 0) /* no match */
+                               continue;
+                       ret = -E_WRITE_COMMON_SYNTAX;
+                       wconf = check_writer_arg(cmd, &writer_num);
+                       if (!wconf)
+                               goto out;
+                       nw = a->num_writers;
+                       a->writer_nums = para_realloc(a->writer_nums, (nw + 1) * sizeof(int));
+                       a->writer_conf = para_realloc(a->writer_conf, (nw + 1) * sizeof(void *));
+                       a->writer_nums[nw] = writer_num;
+                       a->writer_conf[nw] = wconf;
+                       PARA_INFO_LOG("%s writer #%d: %s\n", audio_formats[writer_num],
+                               nw, writer_names[writer_num]);
+                       a->num_writers++;
                }
-               a->writer_nums[nw] = writer_num;
-               a->writer_conf[nw] = wconf;
-               PARA_INFO_LOG("%s writer #%d: %s\n", audio_formats[ret],
-                       nw, writer_names[writer_num]);
-               a->num_writers++;
        }
        ret = 1;
 out:
@@ -813,26 +812,35 @@ static int parse_receiver_args(void)
        struct audio_format_info *a;
 
        for (i = conf.receiver_given - 1; i >= 0; i--) {
-               char *arg = conf.receiver_arg[i];
-               char *recv_arg = strchr(arg, ':');
-               ret = -E_MISSING_COLON;
-               if (!recv_arg)
-                       goto out;
-               *recv_arg = '\0';
-               recv_arg++;
-               ret = get_audio_format_num(arg);
+               char *arg;
+               int j, af_mask;
+
+               ret = parse_stream_command(conf.receiver_arg[i], &arg);
                if (ret < 0)
                        goto out;
-               afi[ret].receiver_conf = check_receiver_arg(recv_arg, &receiver_num);
-               if (!afi[ret].receiver_conf) {
+               af_mask = ret;
+               FOR_EACH_AUDIO_FORMAT(j) {
+                       a = afi + j;
+                       if ((af_mask & (1 << j)) == 0) /* no match */
+                               continue;
+                       /*
+                        * If multiple receivers are given for this audio format, the
+                        * last one wins and we have to free the previous receiver
+                        * config here. Since we are iterating backwards, the winning
+                        * receiver arg is in fact the first one given.
+                        */
+                       if (a->receiver_conf)
+                               a->receiver->free_config(a->receiver_conf);
+                       a->receiver_conf = check_receiver_arg(arg, &receiver_num);
                        ret = -E_RECV_SYNTAX;
-                       goto out;
+                       if (!a->receiver_conf)
+                               goto out;
+                       a->receiver = receivers + receiver_num;
                }
-               afi[ret].receiver = &receivers[receiver_num];
        }
-       /* use the first available receiver with no arguments
-        * for those audio formats for which no receiver
-        * was specified
+       /*
+        * Use the first available receiver with no arguments for those audio
+        * formats for which no receiver was specified.
         */
        cmd = para_strdup(receivers[0].name);
        FOR_EACH_AUDIO_FORMAT(i) {
@@ -844,6 +852,11 @@ static int parse_receiver_args(void)
                        return -E_RECV_SYNTAX;
                a->receiver = &receivers[receiver_num];
        }
+       FOR_EACH_AUDIO_FORMAT(i) {
+               a = afi + i;
+               PARA_INFO_LOG("receiving %s streams via %s receiver\n",
+                       audio_formats[i], a->receiver->name);
+       }
        ret = 1;
 out:
        free(cmd);
@@ -862,8 +875,8 @@ static int init_default_filters(void)
                if (a->num_filters)
                        continue; /* no default -- nothing to to */
                /*
-                * If udp is used to receive this audiod format, add fecdec as
-                * the first filter.
+                * udp and dccp streams are fec-encoded, so add fecdec as the
+                * first filter.
                 */
                if (strcmp(afi[i].receiver->name, "udp") == 0 ||
                                strcmp(afi[i].receiver->name, "dccp") == 0) {
@@ -896,30 +909,23 @@ out:
 
 static int parse_filter_args(void)
 {
-       int i, ret, nf;
+       int i, j, ret, af_mask;
 
-       nf = PARA_MAX(2U, conf.filter_given);
-       PARA_INFO_LOG("maximal number of filters: %d\n", nf);
-       FOR_EACH_AUDIO_FORMAT(i) {
-               afi[i].filter_conf = para_malloc(nf * sizeof(void *));
-               afi[i].filter_nums = para_malloc(nf * sizeof(unsigned));
-       }
        if (!conf.no_default_filters_given)
                return init_default_filters();
        for (i = 0; i < conf.filter_given; i++) {
-               char *arg = conf.filter_arg[i];
-               char *filter_name = strchr(arg, ':');
-               ret = -E_MISSING_COLON;
-               if (!filter_name)
-                       goto out;
-               *filter_name = '\0';
-               filter_name++;
-               ret = get_audio_format_num(arg);
-               if (ret < 0)
-                       goto out;
-               ret = add_filter(ret, filter_name);
+               char *arg;
+               ret = parse_stream_command(conf.filter_arg[i], &arg);
                if (ret < 0)
                        goto out;
+               af_mask = ret;
+               FOR_EACH_AUDIO_FORMAT(j) {
+                       if ((af_mask & (1 << j)) == 0) /* no match */
+                               continue;
+                       ret = add_filter(j, arg);
+                       if (ret < 0)
+                               goto out;
+               }
        }
        ret = init_default_filters(); /* use default values for the rest */
 out:
@@ -1042,7 +1048,6 @@ static void close_stat_pipe(void)
 {
        if (!stat_task->ct)
                return;
-       btr_free_node(stat_task->ct->btrn);
        client_close(stat_task->ct);
        stat_task->ct = NULL;
        clear_and_dump_items();
@@ -1089,17 +1094,17 @@ static void try_to_close_slot(int slot_num)
 
        if (s->format < 0)
                return;
-       if (s->receiver_node && s->receiver_node->task.error != -E_TASK_UNREGISTERED)
+       if (s->receiver_node && s->receiver_node->task.error >= 0)
                return;
        for (i = 0; i < a->num_filters; i++)
-               if (s->fns && s->fns[i].task.error != -E_TASK_UNREGISTERED)
+               if (s->fns && s->fns[i].task.error >= 0)
                        return;
        if (a->num_writers > 0) {
                for (i = 0; i < a->num_writers; i++)
-                       if (s->wns && s->wns[i].task.error != -E_TASK_UNREGISTERED)
+                       if (s->wns && s->wns[i].task.error >= 0)
                                return;
        } else {
-               if (s->wns && s->wns[0].task.error != -E_TASK_UNREGISTERED)
+               if (s->wns && s->wns[0].task.error >= 0)
                        return;
        }
        PARA_INFO_LOG("closing slot %d\n", slot_num);
@@ -1180,7 +1185,7 @@ static void status_post_select(__a_unused struct sched *s, struct task *t)
                        kill_btrn(st->ct->btrn, &st->ct->task, -E_AUDIOD_OFF);
                        goto out;
                }
-               if (st->ct->task.error != -E_TASK_UNREGISTERED)
+               if (st->ct->task.error >= 0)
                        goto out;
                close_stat_pipe();
                st->clock_diff_count = conf.clock_diff_count_arg;
@@ -1191,7 +1196,7 @@ static void status_post_select(__a_unused struct sched *s, struct task *t)
                size_t sz;
                int ret;
                if (st->ct->task.error < 0) {
-                       if (st->ct->task.error != -E_TASK_UNREGISTERED)
+                       if (st->ct->task.error >= 0)
                                goto out;
                        close_stat_pipe();
                        goto out;