split audiod
authorAndre <maan@p133.(none)>
Wed, 7 Jun 2006 18:17:11 +0000 (20:17 +0200)
committerAndre <maan@p133.(none)>
Wed, 7 Jun 2006 18:17:11 +0000 (20:17 +0200)
move everything that is related to audio commands to the new file
audiod_command.c. Also, simplify the handling of the current time:
The "now" pointer is no longer a field of the sched struct but is
globally visable for read-only access.

13 files changed:
NEWS
alsa_writer.c
audiod.c
audiod.h
audiod_command.c [new file with mode: 0644]
configure.ac
error.h
filter.c
mp3dec.c
ortp_recv.c
sched.c
sched.h
write.c

diff --git a/NEWS b/NEWS
index 06330e7..253b586 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,8 @@ A bunch of new features and core changes.
 
        o new audiod commands: tasks, kill
 
+       o para_client uses the error subsystem
+
 
 0.2.12 (2006-05-12) "oriented abstraction"
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
index da02ac2..7d7d36b 100644 (file)
@@ -155,7 +155,7 @@ static int alsa_write_pre_select(struct sched *s, struct writer_node *wn)
 
        if (*wng->loaded < pad->bytes_per_frame)
                return 1;
-       if (tv_diff(&s->now, &pad->next_chunk, &diff) < 0) {
+       if (tv_diff(now, &pad->next_chunk, &diff) < 0) {
                if (tv_diff(&s->timeout, &diff, NULL) > 0)
                        s->timeout = diff;
        } else {
@@ -166,7 +166,8 @@ static int alsa_write_pre_select(struct sched *s, struct writer_node *wn)
 //     PARA_INFO_LOG("timeout: %lu\n", tv2ms(&s->timeout));
 }
 
-static int alsa_write_post_select(struct sched *s, struct writer_node *wn)
+static int alsa_write_post_select(__a_unused struct sched *s,
+               struct writer_node *wn)
 {
        struct private_alsa_data *pad = wn->private_data;
        struct writer_node_group *wng = wn->wng;
@@ -181,7 +182,7 @@ static int alsa_write_post_select(struct sched *s, struct writer_node *wn)
                        wn->written = *wng->loaded;
                return 1;
        }
-       if (tv_diff(&s->now, &pad->next_chunk, NULL) < 0)
+       if (tv_diff(now, &pad->next_chunk, NULL) < 0)
                return 1;
        ret = snd_pcm_writei(pad->handle, data, frames);
        if (ret == -EPIPE) {
@@ -195,7 +196,7 @@ static int alsa_write_post_select(struct sched *s, struct writer_node *wn)
        }
        ms2tv(pad->buffer_time / 4000, &tv);
 //     ms2tv(1, &tv);
-       tv_add(&s->now, &tv, &pad->next_chunk);
+       tv_add(now, &tv, &pad->next_chunk);
        wn->written += ret * pad->bytes_per_frame;
        return 1;
 }
index 3b2a4aa..bcead91 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -43,15 +43,6 @@ INIT_AUDIOD_ERRLISTS;
 /** define the array containing all supported audio formats */
 DEFINE_AUDIO_FORMAT_ARRAY;
 
-/**
- * the possible modes of operation
- *
- * - off: disconnect from para_server
- * - on: receive status information from para_server and play the audio stream
- * - sb: only receive status information but not the audio stream
-*/
-enum {AUDIOD_OFF, AUDIOD_ON, AUDIOD_STANDBY};
-
 /** defines how to handle one supported audio format */
 struct audio_format_info {
        /** pointer to the receiver for this audio format */
@@ -74,43 +65,22 @@ struct audio_format_info {
        struct timeval restart_barrier;
 };
 
-/**
- * describes one instance of a receiver-filter-writer chain
- *
- * \sa receier_node, receiver, filter, filter_node, filter_chain, writer,
- * writer_node, writer_node_group.
-  */
-struct slot_info {
-       /** number of the audio format in this slot */
-       int format;
-       /** writer start time */
-       struct timeval wstime;
-       /** the receiver info associated with this slot */
-       struct receiver_node *receiver_node;
-       /** the active filter chain */
-       struct filter_chain *fc;
-       /** the active writer node group */
-       struct writer_node_group *wng;
-};
-static struct slot_info slot[MAX_STREAM_SLOTS];
+struct slot_info slot[MAX_STREAM_SLOTS];
+
 
-extern const char *status_item_list[NUM_STAT_ITEMS];
+int audiod_status = AUDIOD_ON;
 
-static struct gengetopt_args_info conf;
-static struct timeval server_stream_start, sa_time_diff;
-static int playing, current_decoder = -1,
-       audiod_status = AUDIOD_ON, offset_seconds, length_seconds,
-       sa_time_diff_sign = 1;
+struct gengetopt_args_info conf;
 static char *af_status, /* the audio format announced in server status */
-       *socket_name, *hostname;
-static char *stat_item_values[NUM_STAT_ITEMS];
+       *socket_name;
 static FILE *logfile;
-static const struct timeval restart_delay = {0, 200 * 1000};
 static struct audio_format_info afi[NUM_AUDIO_FORMATS];
-static struct timeval *now;
 
 static struct signal_task signal_task_struct, *sig_task = &signal_task_struct;
 
+static struct status_task status_task_struct;
+struct status_task *stat_task = &status_task_struct;
+
 /**
  * the task for handling audiod commands
  *
@@ -123,181 +93,14 @@ struct command_task {
        struct task task;
 };
 
-/**
- * the task for audiod's child (para_client stat)
- *
- * \sa struct task, struct sched
- */
-struct status_task {
-       /** the output of the stat command is read from this fd */
-       int fd;
-       /** stat data is stored here */
-       char buf[STRINGSIZE];
-       /** number of bytes loaded in \a buf */
-       unsigned loaded;
-       /** the associated task structure */
-       struct task task;
-       /** do not restart client command until this time */
-       struct timeval restart_barrier;
-};
-static struct status_task status_task_struct, *stat_task = &status_task_struct;
-
 struct signal_task {
        int fd;
        int signum;
        struct task task;
 };
 
-/** defines one command of para_audiod */
-struct audiod_command {
-       /** the name of the command */
-       const char *name;
-       /** pointer to the function that handles the command */
-       int (*handler)(int, int, char**);
-       /**
-        * if the command prefers to handle the full line (rather than the usual
-        * argv[] array), it stores a pointer to the corresponding line handling
-        * function here. In this case, the above \a handler pointer must be NULL.
-        */
-       int (*line_handler)(int, char*);
-       /** one-line description of the command */
-       const char *description;
-       /** summary of the command line options */
-       const char *synopsis;
-       /** the long help text */
-       const char *help;
-};
-static int com_grab(int, char *);
-static int com_cycle(int, int, char **);
-static int com_help(int, int, char **);
-static int com_kill(int, int, char **);
-static int com_off(int, int, char **);
-static int com_on(int, int, char **);
-static int com_sb(int, int, char **);
-static int com_stat(int, int, char **);
-static int com_tasks(int, int, char **);
-static int com_term(int, int, char **);
-static struct audiod_command cmds[] = {
-{
-.name = "cycle",
-.handler = com_cycle,
-.description = "switch to next mode",
-.synopsis = "cycle",
-.help =
-
-"on -> standby -> off -> on\n"
-
-},
-{
-.name = "grab",
-.line_handler = com_grab,
-.description = "grab the audio stream",
-.synopsis = "-- grab [grab_options]",
-.help =
-
-"grab ('splice') the audio stream at any position in the filter      \n"
-"chain and send that data back to the client. Try\n"
-"\t para_audioc -- grab -h\n"
-"for the list of available options.\n"
-},
-
-{
-.name = "help",
-.handler = com_help,
-.description = "display command list or help for given command",
-.synopsis = "help [command]",
-.help =
-
-"When I was younger, so much younger than today, I never needed\n"
-"anybody's help in any way. But now these days are gone, I'm not so\n"
-"self assured. Now I find I've changed my mind and opened up the doors.\n"
-"\n"
-"                              -- Beatles: Help\n"
-
-},
-{
-.name = "kill",
-.handler = com_kill,
-.description = "kill an active audiod task",
-.synopsis = "kill task_id [task_id ...]",
-.help =
-
-"call sched_unregister() and the event_handler of the given task(s)\n"
-
-},
-{
-.name = "off",
-.handler = com_off,
-.description = "deactivate para_audiod",
-.synopsis = "off",
-.help =
-
-"Close connection to para_server and stop all decoders.\n"
-
-},
-{
-.name = "on",
-.handler = com_on,
-.description = "activate para_audiod",
-.synopsis = "on",
-.help =
-
-"Establish connection to para_server, retrieve para_server's current\n"
-"status. If playing, start corresponding decoder. Otherwise stop\n"
-"all decoders.\n"
-
-},
-{
-.name = "sb",
-.handler = com_sb,
-.description = "enter standby mode",
-.synopsis = "sb",
-.help =
-
-"Stop all decoders but leave connection to para_server open.\n"
-
-},
-{
-.name = "stat",
-.handler = com_stat,
-.description = "print status information",
-.synopsis = "stat [item1 ...]",
-.help =
-
-"Dump given status items (all if none given) to stdout.\n"
-
-},
-{
-.name = "tasks",
-.handler = com_tasks,
-.description = "list current tasks",
-.synopsis = "tasks",
-.help =
-
-"print the list of task ids together with the status of each task\n"
-
-},
-{
-.name = "term",
-.handler = com_term,
-.description = "terminate audiod",
-.synopsis = "term",
-.help =
-
-"Stop all decoders, shut down connection to para_server and exit.\n"
-
-},
-{
-.name = NULL,
-}
-};
-
-/** iterate over all slots */
-#define FOR_EACH_SLOT(_slot) for (_slot = 0; _slot < MAX_STREAM_SLOTS; _slot++)
 /** iterate over all supported audio formats */
 #define FOR_EACH_AUDIO_FORMAT(af) for (af = 0; af < NUM_AUDIO_FORMATS; af++)
-/** iterate over the array of all audiod commands */
-#define FOR_EACH_COMMAND(c) for (c = 0; cmds[c].name; c++)
 
 /**
  * get the audio format number
@@ -325,9 +128,12 @@ void para_log(int ll, const char* fmt,...)
        struct tm *tm;
        time_t t1;
        char str[MAXLINE] = "";
+       static char *hostname;
 
        if (ll < conf.loglevel_arg)
                return;
+       if (!hostname)
+               hostname = para_hostname();
        outfd = logfile? logfile : stderr;
        time(&t1);
        tm = localtime(&t1);
@@ -340,100 +146,6 @@ void para_log(int ll, const char* fmt,...)
        va_end(argp);
 }
 
-static int client_write(int fd, const char *buf)
-{
-       size_t len = strlen(buf);
-       return write(fd, buf, len) != len? -E_CLIENT_WRITE: 1;
-}
-
-static char *get_time_string(struct timeval *newest_stime)
-{
-       struct timeval diff, adj_stream_start, tmp;
-       int total = 0, use_server_time = 1;
-
-       if (!playing) {
-               if (length_seconds)
-                       return NULL;
-               return make_message("%s:\n", status_item_list[SI_PLAY_TIME]);
-       }
-       if (audiod_status == AUDIOD_OFF)
-               goto out;
-       if (sa_time_diff_sign > 0)
-               tv_diff(&server_stream_start, &sa_time_diff,
-                       &adj_stream_start);
-       else
-               tv_add(&server_stream_start, &sa_time_diff,
-                       &adj_stream_start);
-       tmp = adj_stream_start;
-       if (newest_stime && audiod_status == AUDIOD_ON) {
-               tv_diff(newest_stime, &adj_stream_start, &diff);
-               if (tv2ms(&diff) < 5000) {
-                       tmp = *newest_stime;
-                       use_server_time = 0;
-               }
-       }
-       tv_diff(now, &tmp, &diff);
-       total = diff.tv_sec + offset_seconds;
-       if (total > length_seconds)
-               total = length_seconds;
-       if (total < 0)
-               total = 0;
-out:
-       return make_message(
-               "%s:%s%d:%02d [%d:%02d] (%d%%/%d:%02d)\n",
-               status_item_list[SI_PLAY_TIME],
-               use_server_time? "~" : "",
-               total / 60,
-               total % 60,
-               (length_seconds - total) / 60,
-               (length_seconds - total) % 60,
-               length_seconds? (total * 100 + length_seconds / 2) /
-                       length_seconds : 0,
-               length_seconds / 60,
-               length_seconds % 60
-       );
-}
-
-__malloc static char *audiod_status_string(void)
-{
-       const char *status = (audiod_status == AUDIOD_ON)?
-               "on" : (audiod_status == AUDIOD_OFF)? "off": "sb";
-       return make_message("%s:%s\n", status_item_list[SI_AUDIOD_STATUS], status);
-}
-
-static struct timeval *wstime(void)
-{
-       int i;
-       struct timeval *max = NULL;
-       FOR_EACH_SLOT(i) {
-               struct slot_info *s = &slot[i];
-               if (!s->wng)
-                       continue;
-               if (max && tv_diff(&s->wstime, max, NULL) <= 0)
-                       continue;
-               max = &s->wstime;
-       }
-       return max;
-}
-__malloc static char *decoder_flags(void)
-{
-       int i;
-       char decoder_flags[MAX_STREAM_SLOTS + 1];
-
-       FOR_EACH_SLOT(i) {
-               struct slot_info *s = &slot[i];
-               char flag = '0';
-               if (s->receiver_node)
-                       flag += 1;
-               if (s->wng)
-                       flag += 2;
-               decoder_flags[i] = flag;
-       }
-       decoder_flags[MAX_STREAM_SLOTS] = '\0';
-       return make_message("%s:%s\n", status_item_list[SI_DECODER_FLAGS],
-               decoder_flags);
-}
-
 static char *configfile_exists(void)
 {
        static char *config_file;
@@ -458,38 +170,6 @@ static void setup_signal_handling(void)
 //     signal(SIGPIPE, SIG_IGN);
 }
 
-static void audiod_status_dump(void)
-{
-       static char *p_ts, *p_us, *p_as, *p_df;
-       struct timeval *t = wstime();
-       char *us, *tmp = get_time_string(t);
-
-       if (tmp && (!p_ts || strcmp(tmp, p_ts)))
-               stat_client_write(tmp, SI_PLAY_TIME);
-       free(p_ts);
-       p_ts = tmp;
-
-       us = uptime_str();
-       tmp = make_message("%s:%s\n", status_item_list[SI_AUDIOD_UPTIME], us);
-       free(us);
-       if (!p_us || strcmp(p_us, tmp))
-               stat_client_write(tmp, SI_AUDIOD_UPTIME);
-       free(p_us);
-       p_us = tmp;
-
-       tmp = audiod_status_string();
-       if (!p_as || strcmp(p_as, tmp))
-               stat_client_write(tmp, SI_AUDIOD_STATUS);
-       free(p_as);
-       p_as = tmp;
-
-       tmp = decoder_flags();
-       if (!p_df || strcmp(p_df, tmp))
-               stat_client_write(tmp, SI_DECODER_FLAGS);
-       free(p_df);
-       p_df = tmp;
-}
-
 static void clear_slot(int slot_num)
 {
        struct slot_info *s = &slot[slot_num];
@@ -503,6 +183,7 @@ static void close_receiver(int slot_num)
 {
        struct slot_info *s = &slot[slot_num];
        struct audio_format_info *a;
+       const struct timeval restart_delay = {0, 200 * 1000};
 
        if (s->format < 0 || !s->receiver_node)
                return;
@@ -589,21 +270,21 @@ static void close_stat_pipe(void)
        stat_task->fd = -1;
 //     kill_all_decoders();
        for (i = 0; i < NUM_STAT_ITEMS; i++) {
-               free(stat_item_values[i]);
-               stat_item_values[i] = NULL;
+               free(stat_task->stat_item_values[i]);
+               stat_task->stat_item_values[i] = NULL;
        }
        dump_empty_status();
-       length_seconds = 0;
-       offset_seconds = 0;
+       stat_task->length_seconds = 0;
+       stat_task->offset_seconds = 0;
        audiod_status_dump();
-       playing = 0;
-       stat_item_values[SI_STATUS_BAR] = make_message(
+       stat_task->playing = 0;
+       stat_task->stat_item_values[SI_STATUS_BAR] = make_message(
                "%s:no connection to para_server\n",
                status_item_list[SI_STATUS_BAR]);
-       stat_client_write(stat_item_values[SI_STATUS_BAR], SI_STATUS_BAR);
+       stat_client_write(stat_task->stat_item_values[SI_STATUS_BAR], SI_STATUS_BAR);
 }
 
-static void __noreturn clean_exit(int status, const char *msg)
+void __noreturn clean_exit(int status, const char *msg)
 {
        PARA_EMERG_LOG("%s\n", msg);
        if (socket_name)
@@ -675,31 +356,6 @@ static void open_filters(int slot_num)
        register_task(&s->fc->task);
 }
 
-static struct filter_node *find_filter_node(int slot_num, int format, int filternum)
-{
-       struct filter_node *fn;
-       int i, j;
-
-       FOR_EACH_SLOT(i) {
-               struct slot_info *s = &slot[i];
-               if (s->format < 0 || !s->fc)
-                       continue;
-               if (slot_num >= 0 && slot_num != i)
-                       continue;
-               if (format >= 0 && s->format != format)
-                       continue;
-               if (num_filters(i) < filternum)
-                       continue;
-               /* success */
-               j = 1;
-               list_for_each_entry(fn, &s->fc->filters, node)
-                       if (filternum <= 0 || j++ == filternum)
-                               break;
-               return fn;
-       }
-       return NULL;
-}
-
 static void wng_event_handler(struct task *t)
 {
        struct writer_node_group *wng = t->private_data;
@@ -744,7 +400,6 @@ static void open_writers(int slot_num)
                return;
        }
        s->wstime = *now;
-       current_decoder = slot_num;
        activate_inactive_grab_clients(slot_num, s->format, &s->fc->filters);
 }
 
@@ -815,7 +470,7 @@ static void compute_time_diff(const struct timeval *status_time)
 {
        struct timeval tmp, diff;
        static int count;
-       int sign;
+       int sign, sa_time_diff_sign = stat_task->sa_time_diff_sign;
        const struct timeval max_deviation = {0, 500 * 1000};
        const int time_smooth = 5;
 
@@ -824,27 +479,27 @@ static void compute_time_diff(const struct timeval *status_time)
 //                     sign, sa_time_diff_sign);
        if (!count) {
                sa_time_diff_sign = sign;
-               sa_time_diff = diff;
+               stat_task->sa_time_diff = diff;
                count++;
                return;
        }
        if (count > 5) {
-               int s = tv_diff(&diff, &sa_time_diff, &tmp);
+               int s = tv_diff(&diff, &stat_task->sa_time_diff, &tmp);
                if (tv_diff(&max_deviation, &tmp, NULL) < 0)
                        PARA_WARNING_LOG("time diff jump: %lims\n",
                                s * tv2ms(&tmp));
        }
        count++;
        sa_time_diff_sign = tv_convex_combination(
-               sa_time_diff_sign * time_smooth, &sa_time_diff,
+               sa_time_diff_sign * time_smooth, &stat_task->sa_time_diff,
                count > 10? sign : sign * time_smooth, &diff,
                &tmp);
-       sa_time_diff = tmp;
+       stat_task->sa_time_diff = tmp;
        PARA_DEBUG_LOG("time diff (cur/avg): %s%lums/%s%lums\n",
                sign > 0? "+" : "-",
                tv2ms(&diff),
                sa_time_diff_sign ? "+" : "-",
-               tv2ms(&sa_time_diff)
+               tv2ms(&stat_task->sa_time_diff)
        );
 }
 
@@ -866,27 +521,27 @@ static void check_stat_line(char *line)
        tmp = make_message("%s\n", line);
        stat_client_write(tmp, itemnum);
        free(tmp);
-       free(stat_item_values[itemnum]);
-       stat_item_values[itemnum] = para_strdup(line);
+       free(stat_task->stat_item_values[itemnum]);
+       stat_task->stat_item_values[itemnum] = para_strdup(line);
        ilen = strlen(status_item_list[itemnum]);
        switch (itemnum) {
        case SI_STATUS:
-               playing = strstr(line, "playing")? 1 : 0;
+               stat_task->playing = strstr(line, "playing")? 1 : 0;
                break;
        case SI_FORMAT:
                free(af_status);
                af_status = para_strdup(line + ilen + 1);
                break;
        case SI_OFFSET:
-               offset_seconds = atoi(line + ilen + 1);
+               stat_task->offset_seconds = atoi(line + ilen + 1);
                break;
        case SI_LENGTH:
-               length_seconds = atoi(line + ilen + 1);
+               stat_task->length_seconds = atoi(line + ilen + 1);
                break;
        case SI_STREAM_START:
                if (sscanf(line + ilen + 1, "%lu.%lu", &sec, &usec) == 2) {
-                       server_stream_start.tv_sec = sec;
-                       server_stream_start.tv_usec = usec;
+                       stat_task->server_stream_start.tv_sec = sec;
+                       stat_task->server_stream_start.tv_usec = usec;
                }
                break;
        case SI_CURRENT_TIME:
@@ -949,8 +604,7 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
        struct timeval min_delay = {0, 1};
 
        t->ret = 1;
-       now = &s->now;
-       if (audiod_status != AUDIOD_ON || !playing)
+       if (audiod_status != AUDIOD_ON || !stat_task->playing)
                return kill_all_decoders();
        if (open_current_receiver(s))
                s->timeout = min_delay;
@@ -982,12 +636,12 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
        }
 }
 
-static void audiod_post_select(struct sched *s, __a_unused struct task *t)
+static void audiod_post_select(__a_unused struct sched *s,
+       __a_unused struct task *t)
 {
        int i;
 
        /* save away the current time for other users */
-       now = &s->now;
        t->ret = 1;
        FOR_EACH_SLOT(i)
                try_to_close_slot(i);
@@ -1202,310 +856,6 @@ static int init_stream_io(void)
        return 1;
 }
 
-static int dump_commands(int fd)
-{
-       char *buf = para_strdup(""), *tmp = NULL;
-       int i;
-       ssize_t ret;
-
-       FOR_EACH_COMMAND(i) {
-               tmp = make_message("%s%s\t%s\n", buf, cmds[i].name,
-                       cmds[i].description);
-               free(buf);
-               buf = tmp;
-       }
-       ret = client_write(fd, buf);
-       free(buf);
-       return ret;
-}
-
-/*
- * command handlers don't close their fd on errors (ret < 0) so that
- * its caller can send an error message. Otherwise (ret >= 0) it's up
- * to each individual command to close the fd if necessary.
- */
-
-static int com_help(int fd, int argc, char **argv)
-{
-       int i, ret;
-       char *buf;
-       const char *dflt = "No such command. Available commands:\n";
-
-       if (argc < 2) {
-               ret = dump_commands(fd);
-               goto out;
-       }
-       FOR_EACH_COMMAND(i) {
-               if (strcmp(cmds[i].name, argv[1]))
-                       continue;
-               buf = make_message(
-                       "NAME\n\t%s -- %s\n"
-                       "SYNOPSIS\n\tpara_audioc %s\n"
-                       "DESCRIPTION\n%s\n",
-                       argv[1],
-                       cmds[i].description,
-                       cmds[i].synopsis,
-                       cmds[i].help
-               );
-               ret = client_write(fd, buf);
-               free(buf);
-               goto out;
-       }
-       ret = client_write(fd, dflt);
-       if (ret > 0)
-               ret = dump_commands(fd);
-out:
-       if (ret >= 0)
-               close(fd);
-       return ret;
-}
-
-static int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
-{
-       char *tl = get_task_list();
-       int ret = 1;
-       if (tl)
-               ret = client_write(fd, tl);
-       free(tl);
-       if (ret > 0)
-               close(fd);
-       return ret;
-}
-
-static int com_kill(int fd, int argc, char **argv)
-{
-       int i, ret = 1;
-       if (argc < 2)
-               return -E_AUDIOD_SYNTAX;
-       for (i = 1; i < argc; i++) {
-               ret = kill_task(argv[i]);
-               if (ret < 0)
-                       break;
-       }
-       if (ret > 0)
-               close(fd);
-       return ret;
-}
-
-static int com_stat(int fd, __a_unused int argc, __a_unused char **argv)
-{
-       int i, ret;
-       char *buf = NULL;
-       long unsigned mask = ~0LU;
-
-       if (argc > 1) {
-               mask = 0;
-               for (i = 1; i < argc; i++) {
-                       ret = stat_item_valid(argv[i]);
-                       if (ret < 0)
-                               return ret;
-                       mask |= (1 << ret);
-               }
-       }
-       PARA_INFO_LOG("mask: 0x%lx\n", mask);
-       if (mask & (1 << SI_PLAY_TIME)) {
-               struct timeval *t = wstime();
-               char *ts = get_time_string(t);
-               if (ts) {
-                       ret = client_write(fd, ts);
-                       if (ret < 0)
-                               goto out;
-                       free(ts);
-               }
-       }
-       if (mask & (1 << SI_AUDIOD_UPTIME)) {
-               char *tmp, *us = uptime_str();
-               tmp = make_message("%s:%s\n",
-                       status_item_list[SI_AUDIOD_UPTIME], us);
-               free(us);
-               ret = client_write(fd, tmp);
-               if (ret < 0)
-                       goto out;
-               free(tmp);
-       }
-       if (mask & (1 << SI_AUDIOD_STATUS)) {
-               char *s = audiod_status_string();
-               ret = client_write(fd, s);
-               if (ret < 0)
-                       goto out;
-               free(s);
-       }
-       if (mask & (1 << SI_DECODER_FLAGS)) {
-               char *df =decoder_flags();
-               ret = client_write(fd, df);
-               if (ret < 0)
-                       goto out;
-               free(df);
-       }
-
-       for (i = 0; i < NUM_STAT_ITEMS; i++) {
-               char *tmp, *v;
-               if (!((1 << i) & mask))
-                       continue;
-               v = stat_item_values[i];
-               tmp = make_message("%s%s%s", buf? buf: "",
-                       v? v : "", v? "\n" : "");
-               free(buf);
-               buf = tmp;
-       }
-       ret = client_write(fd, buf);
-out:
-       if (ret > 0)
-               ret = stat_client_add(fd, mask);
-       free(buf);
-       return ret;
-}
-
-static int com_grab(int fd, char *cmdline)
-{
-       struct grab_client *gc;
-       struct filter_node *fn;
-       int i, err;
-       char *msg;
-
-       gc = grab_client_new(fd, cmdline, &err);
-       if (!gc)
-               goto err_out;
-       fn = find_filter_node(gc->conf->slot_arg, gc->audio_format_num, gc->conf->filter_num_arg);
-       if (fn)
-               activate_grab_client(gc, fn);
-       return 1;
-err_out:
-       if (err != -E_GC_HELP_GIVEN && err != -E_GC_VERSION_GIVEN)
-               return err;
-       if (err == -E_GC_HELP_GIVEN) {
-               msg = make_message("%s\n\n", grab_client_args_info_usage);
-               for (i = 0; grab_client_args_info_help[i]; i++) {
-                       char *tmp = make_message("%s%s\n", msg,
-                               grab_client_args_info_help[i]);
-                       free(msg);
-                       msg = tmp;
-               }
-       } else
-               msg = make_message("%s %s\n",
-                       GRAB_CLIENT_CMDLINE_PARSER_PACKAGE,
-                       GRAB_CLIENT_CMDLINE_PARSER_VERSION);
-       err = client_write(fd, msg);
-       free(msg);
-       if (err < 0)
-               return err;
-       close(fd);
-       return 1;
-}
-
-static int __noreturn com_term(int fd, __a_unused int argc, __a_unused char **argv)
-{
-       close(fd);
-       clean_exit(EXIT_SUCCESS, "terminating on user request");
-}
-
-static int com_on(int fd, __a_unused int argc, __a_unused char **argv)
-{
-       audiod_status = AUDIOD_ON;
-       close(fd);
-       return 1;
-}
-
-static int com_off(int fd, __a_unused int argc, __a_unused char **argv)
-{
-       audiod_status = AUDIOD_OFF;
-       close(fd);
-       return 1;
-}
-
-static int com_sb(int fd, __a_unused int argc, __a_unused char **argv)
-{
-       audiod_status = AUDIOD_STANDBY;
-       close(fd);
-       return 1;
-}
-
-static int com_cycle(int fd, int argc, char **argv)
-{
-       switch (audiod_status) {
-               case  AUDIOD_ON:
-                       return com_sb(fd, argc, argv);
-                       break;
-               case  AUDIOD_OFF:
-                       return com_on(fd, argc, argv);
-                       break;
-               case  AUDIOD_STANDBY:
-                       return com_off(fd, argc, argv);
-                       break;
-       }
-       close(fd);
-       return 1;
-}
-
-static int check_perms(uid_t uid)
-{
-       int i;
-
-       if (!conf.user_allow_given)
-               return 1;
-       for (i = 0; i < conf.user_allow_given; i++)
-               if (uid == conf.user_allow_arg[i])
-                       return 1;
-       return -E_UCRED_PERM;
-}
-
-static int handle_connect(int accept_fd)
-{
-       int i, argc, ret, clifd = -1;
-       char *cmd = NULL, *p, *buf = para_calloc(MAXLINE), **argv = NULL;
-       struct sockaddr_un unix_addr;
-
-       ret = para_accept(accept_fd, &unix_addr, sizeof(struct sockaddr_un));
-       if (ret < 0)
-               goto out;
-       clifd = ret;
-       ret = recv_cred_buffer(clifd, buf, MAXLINE - 1);
-       if (ret < 0)
-               goto out;
-       PARA_INFO_LOG("connection from user %i, buf: %s\n",  ret, buf);
-       ret = check_perms(ret);
-       if (ret < 0)
-               goto out;
-       ret = -E_INVALID_AUDIOD_CMD;
-       cmd = para_strdup(buf);
-       p = strchr(cmd, '\n');
-       if (!p)
-               p = "";
-       else {
-               *p = '\0';
-               p++;
-       }
-       for (i = 0; cmds[i].name; i++) {
-               int j;
-               if (strcmp(cmds[i].name, cmd))
-                       continue;
-               if (cmds[i].handler) {
-                       argc = split_args(buf, &argv, "\n");
-                       PARA_INFO_LOG("argv[0]: %s, argc= %d\n", argv[0], argc);
-                       ret = cmds[i].handler(clifd, argc, argv);
-                       goto out;
-               }
-               for (j = 0; p[j]; j++)
-                       if (p[j] == '\n')
-                               p[j] = ' ';
-               PARA_INFO_LOG("cmd: %s, options: %s\n", cmd, p);
-               ret = cmds[i].line_handler(clifd, p);
-               goto out;
-       }
-       ret = -E_INVALID_AUDIOD_CMD; /* cmd not found */
-out:
-       free(cmd);
-       free(buf);
-       free(argv);
-       if (clifd > 0 && ret < 0 && ret != -E_CLIENT_WRITE) {
-               char *tmp = make_message("%s\n", PARA_STRERROR(-ret));
-               client_write(clifd, tmp);
-               free(tmp);
-               close(clifd);
-       }
-       return ret;
-}
-
 static int audiod_get_socket(void)
 {
        struct sockaddr_un unix_addr;
@@ -1674,6 +1024,7 @@ static void init_status_task(struct status_task *st)
        st->task.event_handler = status_event_handler;
        st->task.private_data = st;
        st->fd = -1;
+       st->sa_time_diff_sign = 1;
        sprintf(st->task.status, "status task");
 }
 
@@ -1705,7 +1056,6 @@ int main(int argc, char *argv[])
        init_sched();
 
        valid_fd_012();
-       hostname = para_hostname();
        cmdline_parser(argc, argv, &conf);
        para_drop_privileges(conf.user_arg, conf.group_arg);
        cf = configfile_exists();
index 4cd3595..7e2e276 100644 (file)
--- a/audiod.h
+++ b/audiod.h
@@ -10,4 +10,75 @@ enum {
 extern const char *audio_formats[];
 #define DEFINE_AUDIO_FORMAT_ARRAY const char *audio_formats[] = {"mp3", "ogg", "aac", NULL}
 #define MAX_STREAM_SLOTS 5
+/**
+ * the possible modes of operation
+ *
+ * - off: disconnect from para_server
+ * - on: receive status information from para_server and play the audio stream
+ * - sb: only receive status information but not the audio stream
+*/
+enum {AUDIOD_OFF, AUDIOD_ON, AUDIOD_STANDBY};
 
+/**
+ * describes one instance of a receiver-filter-writer chain
+ *
+ * \sa receier_node, receiver, filter, filter_node, filter_chain, writer,
+ * writer_node, writer_node_group.
+  */
+struct slot_info {
+       /** number of the audio format in this slot */
+       int format;
+       /** writer start time */
+       struct timeval wstime;
+       /** the receiver info associated with this slot */
+       struct receiver_node *receiver_node;
+       /** the active filter chain */
+       struct filter_chain *fc;
+       /** the active writer node group */
+       struct writer_node_group *wng;
+};
+/**
+ * the main task of audiod
+ *
+ * \sa struct task, struct sched
+ */
+struct audiod_task {
+       struct timeval *now;
+       struct task task;
+};
+/**
+ * the task for audiod's child (para_client stat)
+ *
+ * \sa struct task, struct sched
+ */
+struct status_task {
+       /** the output of the stat command is read from this fd */
+       int fd;
+       /** stat data is stored here */
+       char buf[STRINGSIZE];
+       /** number of bytes loaded in \a buf */
+       unsigned loaded;
+       /** the associated task structure */
+       struct task task;
+       /** do not restart client command until this time */
+       struct timeval restart_barrier;
+       int playing;
+       int offset_seconds;
+       int length_seconds;
+       int sa_time_diff_sign;
+       char *stat_item_values[NUM_STAT_ITEMS];
+       struct timeval server_stream_start;
+       struct timeval sa_time_diff;
+};
+extern struct status_task *stat_task;
+extern struct slot_info slot[MAX_STREAM_SLOTS];
+extern struct gengetopt_args_info conf;
+extern int audiod_status;
+extern const char *status_item_list[NUM_STAT_ITEMS];
+
+void __noreturn clean_exit(int status, const char *msg);
+int handle_connect(int accept_fd);
+void audiod_status_dump(void);
+
+/** iterate over all slots */
+#define FOR_EACH_SLOT(_slot) for (_slot = 0; _slot < MAX_STREAM_SLOTS; _slot++)
diff --git a/audiod_command.c b/audiod_command.c
new file mode 100644 (file)
index 0000000..c056936
--- /dev/null
@@ -0,0 +1,640 @@
+/*
+ * Copyright (C) 2005-2006 Andre Noll <noll@mathematik.tu-darmstadt.de>
+ *
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program; if not, write to the Free Software
+ *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ */
+
+/** \file audiod.c the paraslash's audio daemon */
+
+#include "para.h"
+
+#include "audiod.cmdline.h"
+#include "list.h"
+#include "close_on_fork.h"
+#include "sched.h"
+#include "filter.h"
+#include "grab_client.cmdline.h"
+#include "grab_client.h"
+
+#include "error.h"
+#include "audiod.h"
+#include "net.h"
+#include "daemon.h"
+#include "string.h"
+#include "fd.h"
+
+/** defines one command of para_audiod */
+struct audiod_command {
+       /** the name of the command */
+       const char *name;
+       /** pointer to the function that handles the command */
+       int (*handler)(int, int, char**);
+       /**
+        * if the command prefers to handle the full line (rather than the usual
+        * argv[] array), it stores a pointer to the corresponding line handling
+        * function here. In this case, the above \a handler pointer must be NULL.
+        */
+       int (*line_handler)(int, char*);
+       /** one-line description of the command */
+       const char *description;
+       /** summary of the command line options */
+       const char *synopsis;
+       /** the long help text */
+       const char *help;
+};
+static int com_grab(int, char *);
+static int com_cycle(int, int, char **);
+static int com_help(int, int, char **);
+static int com_kill(int, int, char **);
+static int com_off(int, int, char **);
+static int com_on(int, int, char **);
+static int com_sb(int, int, char **);
+static int com_stat(int, int, char **);
+static int com_tasks(int, int, char **);
+static int com_term(int, int, char **);
+static struct audiod_command cmds[] = {
+{
+.name = "cycle",
+.handler = com_cycle,
+.description = "switch to next mode",
+.synopsis = "cycle",
+.help =
+
+"on -> standby -> off -> on\n"
+
+},
+{
+.name = "grab",
+.line_handler = com_grab,
+.description = "grab the audio stream",
+.synopsis = "-- grab [grab_options]",
+.help =
+
+"grab ('splice') the audio stream at any position in the filter      \n"
+"chain and send that data back to the client. Try\n"
+"\t para_audioc -- grab -h\n"
+"for the list of available options.\n"
+},
+
+{
+.name = "help",
+.handler = com_help,
+.description = "display command list or help for given command",
+.synopsis = "help [command]",
+.help =
+
+"When I was younger, so much younger than today, I never needed\n"
+"anybody's help in any way. But now these days are gone, I'm not so\n"
+"self assured. Now I find I've changed my mind and opened up the doors.\n"
+"\n"
+"                              -- Beatles: Help\n"
+
+},
+{
+.name = "kill",
+.handler = com_kill,
+.description = "kill an active audiod task",
+.synopsis = "kill task_id [task_id ...]",
+.help =
+
+"call sched_unregister() and the event_handler of the given task(s)\n"
+
+},
+{
+.name = "off",
+.handler = com_off,
+.description = "deactivate para_audiod",
+.synopsis = "off",
+.help =
+
+"Close connection to para_server and stop all decoders.\n"
+
+},
+{
+.name = "on",
+.handler = com_on,
+.description = "activate para_audiod",
+.synopsis = "on",
+.help =
+
+"Establish connection to para_server, retrieve para_server's current\n"
+"status. If playing, start corresponding decoder. Otherwise stop\n"
+"all decoders.\n"
+
+},
+{
+.name = "sb",
+.handler = com_sb,
+.description = "enter standby mode",
+.synopsis = "sb",
+.help =
+
+"Stop all decoders but leave connection to para_server open.\n"
+
+},
+{
+.name = "stat",
+.handler = com_stat,
+.description = "print status information",
+.synopsis = "stat [item1 ...]",
+.help =
+
+"Dump given status items (all if none given) to stdout.\n"
+
+},
+{
+.name = "tasks",
+.handler = com_tasks,
+.description = "list current tasks",
+.synopsis = "tasks",
+.help =
+
+"print the list of task ids together with the status of each task\n"
+
+},
+{
+.name = "term",
+.handler = com_term,
+.description = "terminate audiod",
+.synopsis = "term",
+.help =
+
+"Stop all decoders, shut down connection to para_server and exit.\n"
+
+},
+{
+.name = NULL,
+}
+};
+
+/** iterate over the array of all audiod commands */
+#define FOR_EACH_COMMAND(c) for (c = 0; cmds[c].name; c++)
+
+static int client_write(int fd, const char *buf)
+{
+       size_t len = strlen(buf);
+       return write(fd, buf, len) != len? -E_CLIENT_WRITE: 1;
+}
+
+static char *get_time_string(struct timeval *newest_stime)
+{
+       struct timeval diff, adj_stream_start, tmp;
+       int total = 0, use_server_time = 1,
+               length_seconds = stat_task->length_seconds;
+
+       if (!stat_task->playing) {
+               if (length_seconds)
+                       return NULL;
+               return make_message("%s:\n", status_item_list[SI_PLAY_TIME]);
+       }
+       if (audiod_status == AUDIOD_OFF)
+               goto out;
+       if (stat_task->sa_time_diff_sign > 0)
+               tv_diff(&stat_task->server_stream_start, &stat_task->sa_time_diff,
+                       &adj_stream_start);
+       else
+               tv_add(&stat_task->server_stream_start, &stat_task->sa_time_diff,
+                       &adj_stream_start);
+       tmp = adj_stream_start;
+       if (newest_stime && audiod_status == AUDIOD_ON) {
+               tv_diff(newest_stime, &adj_stream_start, &diff);
+               if (tv2ms(&diff) < 5000) {
+                       tmp = *newest_stime;
+                       use_server_time = 0;
+               }
+       }
+       tv_diff(now, &tmp, &diff);
+       total = diff.tv_sec + stat_task->offset_seconds;
+       if (total > length_seconds)
+               total = length_seconds;
+       if (total < 0)
+               total = 0;
+out:
+       return make_message(
+               "%s:%s%d:%02d [%d:%02d] (%d%%/%d:%02d)\n",
+               status_item_list[SI_PLAY_TIME],
+               use_server_time? "~" : "",
+               total / 60,
+               total % 60,
+               (length_seconds - total) / 60,
+               (length_seconds - total) % 60,
+               length_seconds? (total * 100 + length_seconds / 2) /
+                       length_seconds : 0,
+               length_seconds / 60,
+               length_seconds % 60
+       );
+}
+
+__malloc static char *audiod_status_string(void)
+{
+       const char *status = (audiod_status == AUDIOD_ON)?
+               "on" : (audiod_status == AUDIOD_OFF)? "off": "sb";
+       return make_message("%s:%s\n", status_item_list[SI_AUDIOD_STATUS], status);
+}
+
+static struct timeval *wstime(void)
+{
+       int i;
+       struct timeval *max = NULL;
+       FOR_EACH_SLOT(i) {
+               struct slot_info *s = &slot[i];
+               if (!s->wng)
+                       continue;
+               if (max && tv_diff(&s->wstime, max, NULL) <= 0)
+                       continue;
+               max = &s->wstime;
+       }
+       return max;
+}
+__malloc static char *decoder_flags(void)
+{
+       int i;
+       char decoder_flags[MAX_STREAM_SLOTS + 1];
+
+       FOR_EACH_SLOT(i) {
+               struct slot_info *s = &slot[i];
+               char flag = '0';
+               if (s->receiver_node)
+                       flag += 1;
+               if (s->wng)
+                       flag += 2;
+               decoder_flags[i] = flag;
+       }
+       decoder_flags[MAX_STREAM_SLOTS] = '\0';
+       return make_message("%s:%s\n", status_item_list[SI_DECODER_FLAGS],
+               decoder_flags);
+}
+
+static int dump_commands(int fd)
+{
+       char *buf = para_strdup(""), *tmp = NULL;
+       int i;
+       ssize_t ret;
+
+       FOR_EACH_COMMAND(i) {
+               tmp = make_message("%s%s\t%s\n", buf, cmds[i].name,
+                       cmds[i].description);
+               free(buf);
+               buf = tmp;
+       }
+       ret = client_write(fd, buf);
+       free(buf);
+       return ret;
+}
+
+/*
+ * command handlers don't close their fd on errors (ret < 0) so that
+ * its caller can send an error message. Otherwise (ret >= 0) it's up
+ * to each individual command to close the fd if necessary.
+ */
+
+static int com_help(int fd, int argc, char **argv)
+{
+       int i, ret;
+       char *buf;
+       const char *dflt = "No such command. Available commands:\n";
+
+       if (argc < 2) {
+               ret = dump_commands(fd);
+               goto out;
+       }
+       FOR_EACH_COMMAND(i) {
+               if (strcmp(cmds[i].name, argv[1]))
+                       continue;
+               buf = make_message(
+                       "NAME\n\t%s -- %s\n"
+                       "SYNOPSIS\n\tpara_audioc %s\n"
+                       "DESCRIPTION\n%s\n",
+                       argv[1],
+                       cmds[i].description,
+                       cmds[i].synopsis,
+                       cmds[i].help
+               );
+               ret = client_write(fd, buf);
+               free(buf);
+               goto out;
+       }
+       ret = client_write(fd, dflt);
+       if (ret > 0)
+               ret = dump_commands(fd);
+out:
+       if (ret >= 0)
+               close(fd);
+       return ret;
+}
+
+static int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
+{
+       char *tl = get_task_list();
+       int ret = 1;
+       if (tl)
+               ret = client_write(fd, tl);
+       free(tl);
+       if (ret > 0)
+               close(fd);
+       return ret;
+}
+
+static int com_kill(int fd, int argc, char **argv)
+{
+       int i, ret = 1;
+       if (argc < 2)
+               return -E_AUDIOD_SYNTAX;
+       for (i = 1; i < argc; i++) {
+               ret = kill_task(argv[i]);
+               if (ret < 0)
+                       break;
+       }
+       if (ret > 0)
+               close(fd);
+       return ret;
+}
+
+static int com_stat(int fd, __a_unused int argc, __a_unused char **argv)
+{
+       int i, ret;
+       char *buf = NULL;
+       long unsigned mask = ~0LU;
+
+       if (argc > 1) {
+               mask = 0;
+               for (i = 1; i < argc; i++) {
+                       ret = stat_item_valid(argv[i]);
+                       if (ret < 0)
+                               return ret;
+                       mask |= (1 << ret);
+               }
+       }
+       PARA_INFO_LOG("mask: 0x%lx\n", mask);
+       if (mask & (1 << SI_PLAY_TIME)) {
+               struct timeval *t = wstime();
+               char *ts = get_time_string(t);
+               if (ts) {
+                       ret = client_write(fd, ts);
+                       if (ret < 0)
+                               goto out;
+                       free(ts);
+               }
+       }
+       if (mask & (1 << SI_AUDIOD_UPTIME)) {
+               char *tmp, *us = uptime_str();
+               tmp = make_message("%s:%s\n",
+                       status_item_list[SI_AUDIOD_UPTIME], us);
+               free(us);
+               ret = client_write(fd, tmp);
+               if (ret < 0)
+                       goto out;
+               free(tmp);
+       }
+       if (mask & (1 << SI_AUDIOD_STATUS)) {
+               char *s = audiod_status_string();
+               ret = client_write(fd, s);
+               if (ret < 0)
+                       goto out;
+               free(s);
+       }
+       if (mask & (1 << SI_DECODER_FLAGS)) {
+               char *df =decoder_flags();
+               ret = client_write(fd, df);
+               if (ret < 0)
+                       goto out;
+               free(df);
+       }
+
+       for (i = 0; i < NUM_STAT_ITEMS; i++) {
+               char *tmp, *v;
+               if (!((1 << i) & mask))
+                       continue;
+               v = stat_task->stat_item_values[i];
+               tmp = make_message("%s%s%s", buf? buf: "",
+                       v? v : "", v? "\n" : "");
+               free(buf);
+               buf = tmp;
+       }
+       ret = client_write(fd, buf);
+out:
+       if (ret > 0)
+               ret = stat_client_add(fd, mask);
+       free(buf);
+       return ret;
+}
+
+static struct filter_node *find_filter_node(int slot_num, int format, int filternum)
+{
+       struct filter_node *fn;
+       int i, j;
+
+       FOR_EACH_SLOT(i) {
+               struct slot_info *s = &slot[i];
+               if (s->format < 0 || !s->fc)
+                       continue;
+               if (slot_num >= 0 && slot_num != i)
+                       continue;
+               if (format >= 0 && s->format != format)
+                       continue;
+               if (num_filters(i) < filternum)
+                       continue;
+               /* success */
+               j = 1;
+               list_for_each_entry(fn, &s->fc->filters, node)
+                       if (filternum <= 0 || j++ == filternum)
+                               break;
+               return fn;
+       }
+       return NULL;
+}
+
+static int com_grab(int fd, char *cmdline)
+{
+       struct grab_client *gc;
+       struct filter_node *fn;
+       int i, err;
+       char *msg;
+
+       gc = grab_client_new(fd, cmdline, &err);
+       if (!gc)
+               goto err_out;
+       fn = find_filter_node(gc->conf->slot_arg, gc->audio_format_num, gc->conf->filter_num_arg);
+       if (fn)
+               activate_grab_client(gc, fn);
+       return 1;
+err_out:
+       if (err != -E_GC_HELP_GIVEN && err != -E_GC_VERSION_GIVEN)
+               return err;
+       if (err == -E_GC_HELP_GIVEN) {
+               msg = make_message("%s\n\n", grab_client_args_info_usage);
+               for (i = 0; grab_client_args_info_help[i]; i++) {
+                       char *tmp = make_message("%s%s\n", msg,
+                               grab_client_args_info_help[i]);
+                       free(msg);
+                       msg = tmp;
+               }
+       } else
+               msg = make_message("%s %s\n",
+                       GRAB_CLIENT_CMDLINE_PARSER_PACKAGE,
+                       GRAB_CLIENT_CMDLINE_PARSER_VERSION);
+       err = client_write(fd, msg);
+       free(msg);
+       if (err < 0)
+               return err;
+       close(fd);
+       return 1;
+}
+
+static int __noreturn com_term(int fd, __a_unused int argc, __a_unused char **argv)
+{
+       close(fd);
+       clean_exit(EXIT_SUCCESS, "terminating on user request");
+}
+
+static int com_on(int fd, __a_unused int argc, __a_unused char **argv)
+{
+       audiod_status = AUDIOD_ON;
+       close(fd);
+       return 1;
+}
+
+static int com_off(int fd, __a_unused int argc, __a_unused char **argv)
+{
+       audiod_status = AUDIOD_OFF;
+       close(fd);
+       return 1;
+}
+
+static int com_sb(int fd, __a_unused int argc, __a_unused char **argv)
+{
+       audiod_status = AUDIOD_STANDBY;
+       close(fd);
+       return 1;
+}
+
+static int com_cycle(int fd, int argc, char **argv)
+{
+       switch (audiod_status) {
+               case  AUDIOD_ON:
+                       return com_sb(fd, argc, argv);
+                       break;
+               case  AUDIOD_OFF:
+                       return com_on(fd, argc, argv);
+                       break;
+               case  AUDIOD_STANDBY:
+                       return com_off(fd, argc, argv);
+                       break;
+       }
+       close(fd);
+       return 1;
+}
+
+static int check_perms(uid_t uid)
+{
+       int i;
+
+       if (!conf.user_allow_given)
+               return 1;
+       for (i = 0; i < conf.user_allow_given; i++)
+               if (uid == conf.user_allow_arg[i])
+                       return 1;
+       return -E_UCRED_PERM;
+}
+
+int handle_connect(int accept_fd)
+{
+       int i, argc, ret, clifd = -1;
+       char *cmd = NULL, *p, *buf = para_calloc(MAXLINE), **argv = NULL;
+       struct sockaddr_un unix_addr;
+
+       ret = para_accept(accept_fd, &unix_addr, sizeof(struct sockaddr_un));
+       if (ret < 0)
+               goto out;
+       clifd = ret;
+       ret = recv_cred_buffer(clifd, buf, MAXLINE - 1);
+       if (ret < 0)
+               goto out;
+       PARA_INFO_LOG("connection from user %i, buf: %s\n",  ret, buf);
+       ret = check_perms(ret);
+       if (ret < 0)
+               goto out;
+       ret = -E_INVALID_AUDIOD_CMD;
+       cmd = para_strdup(buf);
+       p = strchr(cmd, '\n');
+       if (!p)
+               p = "";
+       else {
+               *p = '\0';
+               p++;
+       }
+       for (i = 0; cmds[i].name; i++) {
+               int j;
+               if (strcmp(cmds[i].name, cmd))
+                       continue;
+               if (cmds[i].handler) {
+                       argc = split_args(buf, &argv, "\n");
+                       PARA_INFO_LOG("argv[0]: %s, argc= %d\n", argv[0], argc);
+                       ret = cmds[i].handler(clifd, argc, argv);
+                       goto out;
+               }
+               for (j = 0; p[j]; j++)
+                       if (p[j] == '\n')
+                               p[j] = ' ';
+               PARA_INFO_LOG("cmd: %s, options: %s\n", cmd, p);
+               ret = cmds[i].line_handler(clifd, p);
+               goto out;
+       }
+       ret = -E_INVALID_AUDIOD_CMD;
+out:
+       free(cmd);
+       free(buf);
+       free(argv);
+       if (clifd > 0 && ret < 0 && ret != -E_CLIENT_WRITE) {
+               char *tmp = make_message("%s\n", PARA_STRERROR(-ret));
+               client_write(clifd, tmp);
+               free(tmp);
+               close(clifd);
+       }
+       return ret;
+}
+
+void audiod_status_dump(void)
+{
+       static char *p_ts, *p_us, *p_as, *p_df;
+       struct timeval *t = wstime();
+       char *us, *tmp = get_time_string(t);
+
+       if (tmp && (!p_ts || strcmp(tmp, p_ts)))
+               stat_client_write(tmp, SI_PLAY_TIME);
+       free(p_ts);
+       p_ts = tmp;
+
+       us = uptime_str();
+       tmp = make_message("%s:%s\n", status_item_list[SI_AUDIOD_UPTIME], us);
+       free(us);
+       if (!p_us || strcmp(p_us, tmp))
+               stat_client_write(tmp, SI_AUDIOD_UPTIME);
+       free(p_us);
+       p_us = tmp;
+
+       tmp = audiod_status_string();
+       if (!p_as || strcmp(p_as, tmp))
+               stat_client_write(tmp, SI_AUDIOD_STATUS);
+       free(p_as);
+       p_as = tmp;
+
+       tmp = decoder_flags();
+       if (!p_df || strcmp(p_df, tmp))
+               stat_client_write(tmp, SI_DECODER_FLAGS);
+       free(p_df);
+       p_df = tmp;
+}
+
index 080b2e3..3c2f4ec 100644 (file)
@@ -68,7 +68,7 @@ audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline
        http_recv.cmdline dccp_recv.cmdline file_write.cmdline"
 audiod_errlist_objs="audiod exec close_on_fork signal string daemon stat net
        time grab_client filter_chain wav compress http_recv dccp dccp_recv
-       recv_common fd sched write_common file_writer"
+       recv_common fd sched write_common file_writer audiod_command"
 audiod_ldflags=""
 
 server_cmdline_objs="server.cmdline"
diff --git a/error.h b/error.h
index 5dd750a..983f653 100644 (file)
--- a/error.h
+++ b/error.h
@@ -34,6 +34,7 @@ enum para_subsystem {
        SS_NET,
        SS_ORTP_RECV,
        SS_AUDIOD,
+       SS_AUDIOD_COMMAND,
        SS_EXEC,
        SS_STDIN,
        SS_STDOUT,
@@ -159,11 +160,14 @@ extern const char **para_errlist[];
        PARA_ERROR(NO_MORE_SLOTS, "no more empty slots"), \
        PARA_ERROR(MISSING_COLON, "syntax error: missing colon"), \
        PARA_ERROR(UNSUPPORTED_AUDIO_FORMAT, "given audio format not supported"), \
+       PARA_ERROR(STATUS_EOF, "server closed status connection"), \
+
+
+#define AUDIOD_COMMAND_ERRORS \
        PARA_ERROR(CLIENT_WRITE, "client write error"), \
+       PARA_ERROR(AUDIOD_SYNTAX, "syntax error"), \
        PARA_ERROR(UCRED_PERM, "permission denied"), \
        PARA_ERROR(INVALID_AUDIOD_CMD, "invalid command"), \
-       PARA_ERROR(AUDIOD_SYNTAX, "syntax error"), \
-       PARA_ERROR(STATUS_EOF, "server closed status connection"), \
 
 
 #define FILTER_CHAIN_ERRORS \
@@ -495,6 +499,7 @@ SS_ENUM(ORTP_RECV);
 SS_ENUM(NET);
 SS_ENUM(RECV);
 SS_ENUM(AUDIOD);
+SS_ENUM(AUDIOD_COMMAND);
 SS_ENUM(EXEC);
 SS_ENUM(SIGNAL);
 SS_ENUM(STRING);
index 56afebf..608bb8b 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -153,7 +153,6 @@ int main(int argc, char *argv[])
                goto out;
 
        stdout_set_defaults(sot);
-       PARA_EMERG_LOG("fc->output_eof: %d\n", *fc->output_eof);
        sot->buf = fc->outbuf;
        sot->loaded = fc->out_loaded;
        sot->input_eof = &fc->eof;
@@ -163,7 +162,6 @@ int main(int argc, char *argv[])
        register_task(&sit->task);
        s.default_timeout.tv_sec = 1;
        s.default_timeout.tv_usec = 0;
-       PARA_EMERG_LOG("fc->output_eof: %d\n", *fc->output_eof);
        ret = sched(&s);
 out:
        free(sit->buf);
index f809dae..fc2b9d8 100644 (file)
--- a/mp3dec.c
+++ b/mp3dec.c
@@ -98,7 +98,7 @@ next_frame:
 out:
        if (pmd->stream.next_frame) { /* we still have some data */
                size_t off = pmd->stream.bufend - pmd->stream.next_frame;
-//             PARA_DEBUG_LOG("converted %zd, rate: %u, returning %zd\n", len - off,
+//             PARA_INFO_LOG("off: %zd, rate: %u, returning %zd\n", off,
 //                     fn->fc->samplerate, copy - off);
                return copy - off;
        }
index d8432ab..d9b2609 100644 (file)
@@ -73,7 +73,7 @@ static void ortp_recv_pre_select(struct sched *s, struct task *t)
        struct private_ortp_recv_data *pord = rn->private_data;
        struct timeval tmp;
 
-       if (tv_diff(&s->now, &pord->next_chunk, &tmp) >= 0) {
+       if (tv_diff(now, &pord->next_chunk, &tmp) >= 0) {
                tmp.tv_sec = 0;
                tmp.tv_usec = 1000;
        }
@@ -96,7 +96,7 @@ static void compute_next_chunk(unsigned chunk_time,
                pord->next_chunk.tv_usec);
 }
 
-static void ortp_recv_post_select(struct sched *s, struct task *t)
+static void ortp_recv_post_select(__a_unused struct sched *s, struct task *t)
 {
        struct receiver_node *rn = t->private_data;
        struct private_ortp_recv_data *pord = rn->private_data;
@@ -113,7 +113,7 @@ static void ortp_recv_post_select(struct sched *s, struct task *t)
        }
        t->ret = 1;
        if (pord->start.tv_sec)
-               if (tv_diff(&s->now, &pord->next_chunk, NULL) < 0)
+               if (tv_diff(now, &pord->next_chunk, NULL) < 0)
                        return;
        mp = rtp_session_recvm_with_ts(pord->session, pord->timestamp);
        if (!mp) {
@@ -125,12 +125,12 @@ static void ortp_recv_post_select(struct sched *s, struct task *t)
                if ((pord->c_bad > 5000 && pord->start.tv_sec) || pord->c_bad > 10000)
                        return;
                t->ret = 1;
-               tv_add(&s->now, &min_delay, &pord->next_chunk);
+               tv_add(now, &min_delay, &pord->next_chunk);
                return;
        }
        /* okay, we have a chunk of data */
        if (!pord->start.tv_sec)
-               pord->start = s->now;
+               pord->start = *now;
        t->ret = msg_to_buf(mp, tmpbuf, CHUNK_SIZE);
        if (t->ret < ORTP_AUDIO_HEADER_LEN) {
                rn->eof = 1;
@@ -204,7 +204,7 @@ success:
        freemsg(mp);
        if (pord->c_bad) {
                pord->c_bad = 0;
-               pord->next_chunk = s->now;
+               pord->next_chunk = *now;
        }
        compute_next_chunk(chunk_time, pord);
        return;
diff --git a/sched.c b/sched.c
index 27d71f6..c5b2c5e 100644 (file)
--- a/sched.c
+++ b/sched.c
@@ -10,6 +10,9 @@
 struct list_head pre_select_list;
 struct list_head post_select_list;
 
+static struct timeval now_struct;
+struct timeval *now = &now_struct;
+
 static void sched_preselect(struct sched *s)
 {
        struct task *t, *tmp;
@@ -42,7 +45,7 @@ static void sched_post_select(struct sched *s)
 int sched(struct sched *s)
 {
 
-       gettimeofday(&s->now, NULL);
+       gettimeofday(now, NULL);
 again:
        FD_ZERO(&s->rfds);
        FD_ZERO(&s->wfds);
@@ -53,7 +56,7 @@ again:
                &s->wfds, &s->timeout);
        if (s->select_ret < 0)
                return s->select_ret;
-       gettimeofday(&s->now, NULL);
+       gettimeofday(now, NULL);
        sched_post_select(s);
        if (list_empty(&pre_select_list) && list_empty(&post_select_list))
                return 0;
diff --git a/sched.h b/sched.h
index 632fddd..bd1ad79 100644 (file)
--- a/sched.h
+++ b/sched.h
@@ -17,6 +17,8 @@ struct task {
        char status[MAXLINE];
 };
 
+extern struct timeval *now;
+
 void *register_task(struct task *t);
 void unregister_task(struct task *t);
 int sched(struct sched *s);
diff --git a/write.c b/write.c
index 89d79d1..56b4401 100644 (file)
--- a/write.c
+++ b/write.c
@@ -89,7 +89,7 @@ static void initial_delay_pre_select(struct sched *s, struct task *t)
        if (!idt->start_time.tv_sec && !idt->start_time.tv_usec)
                return;
        t->ret = -E_DELAY_TIMEOUT;
-       if (tv_diff(&s->now, &idt->start_time, &diff) > 0)
+       if (tv_diff(now, &idt->start_time, &diff) > 0)
                return;
        t->ret = 1;
        if (tv_diff(&s->timeout , &diff, NULL) > 0)