Recognize the eof packet also in the udp receiver.
[paraslash.git] / audiod.c
index b880eb7f5d819ec60924587b32c72eee20b3bde9..e3fd49d3ba3666c29efd1bcbf0d43fa7089e9de0 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -14,6 +14,7 @@
 #include "audiod.cmdline.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "recv.h"
 #include "filter.h"
 #include "grab_client.cmdline.h"
@@ -66,6 +67,9 @@ struct audio_format_info {
 struct slot_info slot[MAX_STREAM_SLOTS];
 
 
+/** The array of status items sent by para_server. */
+char *stat_item_values[NUM_STAT_ITEMS] = {NULL};
+
 /**
  * the current mode of operation of which can be changed by the on/off/cycle
  * commands. It is either, AUDIOD_OFF, AUDIOD_ON or AUDIOD_STANDBY.
@@ -79,7 +83,6 @@ int audiod_status = AUDIOD_ON;
 struct audiod_args_info conf;
 
 static char *socket_name;
-static FILE *logfile;
 static struct audio_format_info afi[NUM_AUDIO_FORMATS];
 
 static struct signal_task signal_task_struct, *sig_task = &signal_task_struct;
@@ -91,7 +94,7 @@ static struct status_task status_task_struct;
  *
  * \sa struct status_task
  */
-struct status_task *stat_task = &status_task_struct;
+static struct status_task *stat_task = &status_task_struct;
 static struct timeval initial_delay_barrier;
 
 /**
@@ -128,49 +131,98 @@ int get_audio_format_num(char *name)
        return -E_UNSUPPORTED_AUDIO_FORMAT;
 }
 
-/**
- * the log function of para_audiod
- *
- * \param ll loglevel
- * \param fmt the format string
- */
-void para_log(int ll, const char* fmt,...)
+char *get_time_string(struct timeval *newest_stime)
 {
-       va_list argp;
-       FILE *outfd;
-       struct tm *tm;
-       time_t t1;
-       char str[MAXLINE] = "";
-       static char *hostname;
-
-       if (ll < conf.loglevel_arg)
-               return;
-       if (!logfile && conf.daemon_given)
-               return;
-       if (!hostname)
-               hostname = para_hostname();
-       outfd = logfile? logfile : stderr;
-       time(&t1);
-       tm = localtime(&t1);
-       strftime(str, MAXLINE, "%b %d %H:%M:%S", tm);
-       fprintf(outfd, "%s %s ", str, hostname);
-       if (conf.loglevel_arg <= INFO)
-               fprintf(outfd, "%i ", ll);
-       va_start(argp, fmt);
-       vfprintf(outfd, fmt, argp);
-       va_end(argp);
+       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
+       );
+}
+
+static int want_colors(void)
+{
+       if (conf.color_arg == color_arg_no)
+               return 0;
+       if (conf.color_arg == color_arg_yes)
+               return 1;
+       if (conf.logfile_given)
+               return 0;
+       return isatty(STDERR_FILENO);
 }
 
-static char *configfile_exists(void)
+static void parse_config_or_die(void)
 {
-       char *home = para_homedir();
-       char *config_file = make_message("%s/.paraslash/audiod.conf",
-               home);
-       free(home);
-       if (file_exists(config_file))
-               return config_file;
+       int ret;
+       char *config_file;
+       struct audiod_cmdline_parser_params params = {
+               .override = 0,
+               .initialize = 0,
+               .check_required = 1,
+               .check_ambiguity = 0,
+               .print_errors = 1
+       };
+
+       if (conf.config_file_given)
+               config_file = para_strdup(conf.config_file_arg);
+       else {
+               char *home = para_homedir();
+               config_file = make_message("%s/.paraslash/audiod.conf", home);
+               free(home);
+       }
+       ret = file_exists(config_file);
+       if (conf.config_file_given && !ret) {
+               PARA_EMERG_LOG("can not read config file %s\n", config_file);
+               goto err;
+       }
+       if (ret)
+               audiod_cmdline_parser_config_file(config_file, &conf, &params);
+       free(config_file);
+       daemon_set_loglevel(conf.loglevel_arg);
+       return;
+err:
        free(config_file);
-       return NULL;
+       exit(EXIT_FAILURE);
 }
 
 static void setup_signal_handling(void)
@@ -275,7 +327,7 @@ static void open_filters(int slot_num)
                return;
        PARA_INFO_LOG("opening %s filters\n", audio_formats[s->format]);
        s->fc = para_calloc(sizeof(struct filter_chain));
-       s->fc->filter_nodes = para_malloc(nf * sizeof(struct filter_chain));
+       s->fc->filter_nodes = para_malloc(nf * sizeof(struct filter_node));
        s->fc->inbuf = s->receiver_node->buf;
        s->fc->in_loaded = &s->receiver_node->loaded;
        s->fc->input_error = &s->receiver_node->task.error;
@@ -383,8 +435,7 @@ static int receiver_running(int format)
 
        FOR_EACH_SLOT(i) {
                struct slot_info *s = &slot[i];
-               if (s->format == format && s->receiver_node
-                               && s->receiver_node->task.error >= 0)
+               if (s->format == format && s->receiver_node)
                        return 1;
        }
        return 0;
@@ -468,8 +519,8 @@ static int check_stat_line(char *line, __a_unused void *data)
        tmp = make_message("%s\n", line);
        stat_client_write(tmp, itemnum);
        free(tmp);
-       free(stat_task->stat_item_values[itemnum]);
-       stat_task->stat_item_values[itemnum] = para_strdup(line);
+       free(stat_item_values[itemnum]);
+       stat_item_values[itemnum] = para_strdup(line);
        ilen = strlen(status_item_list[itemnum]);
        switch (itemnum) {
        case SI_STATUS:
@@ -545,14 +596,13 @@ static int add_filter(int format, char *cmdline)
        return filter_num;
 }
 
-static int init_writers(void)
+static int parse_writer_args(void)
 {
        int i, ret, nw;
        char *cmd;
        struct audio_format_info *a;
 
-       init_supported_writers();
-       nw = PARA_MAX(1, conf.writer_given);
+       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];
@@ -584,16 +634,12 @@ out:
        return ret;
 }
 
-static int init_receivers(void)
+static int parse_receiver_args(void)
 {
        int i, ret, receiver_num;
        char *cmd = NULL;
        struct audio_format_info *a;
 
-       for (i = 0; receivers[i].name; i++) {
-               PARA_INFO_LOG("initializing %s receiver\n", receivers[i].name);
-               receivers[i].init(&receivers[i]);
-       }
        for (i = conf.receiver_given - 1; i >= 0; i--) {
                char *arg = conf.receiver_arg[i];
                char *recv_arg = strchr(arg, ':');
@@ -664,12 +710,11 @@ out:
        return ret;
 }
 
-static int init_filters(void)
+static int parse_filter_args(void)
 {
        int i, ret, nf;
 
-       filter_init(filters);
-       nf = PARA_MAX(1,  conf.filter_given);
+       nf = PARA_MAX(1U, 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 *));
@@ -697,17 +742,17 @@ out:
        return ret;
 }
 
-static int init_stream_io(void)
+static int parse_stream_args(void)
 {
        int ret;
 
-       ret = init_writers();
+       ret = parse_receiver_args();
        if (ret < 0)
                return ret;
-       ret = init_receivers();
+       ret = parse_filter_args();
        if (ret < 0)
                return ret;
-       ret = init_filters();
+       ret = parse_writer_args();
        if (ret < 0)
                return ret;
        return 1;
@@ -757,13 +802,12 @@ static void signal_pre_select(struct sched *s, struct task *t)
 static void signal_post_select(struct sched *s, struct task *t)
 {
        struct signal_task *st = container_of(t, struct signal_task, task);
-       int signum;
 
        if (!FD_ISSET(st->fd, &s->rfds))
                return;
 
-       signum = para_next_signal();
-       switch (signum) {
+       st->signum = para_next_signal();
+       switch (st->signum) {
        case SIGINT:
        case SIGTERM:
        case SIGHUP:
@@ -816,19 +860,14 @@ static void close_stat_pipe(void)
        client_close(stat_task->ct);
        stat_task->ct = NULL;
        FOR_EACH_STATUS_ITEM(i) {
-               free(stat_task->stat_item_values[i]);
-               stat_task->stat_item_values[i] = NULL;
+               free(stat_item_values[i]);
+               stat_item_values[i] = NULL;
        }
        dump_empty_status();
        stat_task->length_seconds = 0;
        stat_task->offset_seconds = 0;
        audiod_status_dump();
        stat_task->playing = 0;
-       stat_task->stat_item_values[SI_BASENAME] = make_message(
-               "%s: no connection to para_server\n",
-               status_item_list[SI_BASENAME]);
-       stat_client_write(stat_task->stat_item_values[SI_BASENAME],
-               SI_BASENAME);
 }
 
 /**
@@ -976,15 +1015,21 @@ static void status_pre_select(struct sched *s, struct task *t)
                int argc = 3;
                PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count);
                st->clock_diff_count--;
-               client_open(argc, argv, &st->ct);
+               client_open(argc, argv, &st->ct, NULL);
                set_stat_task_restart_barrier(2);
 
        } else {
                char *argv[] = {"audiod", "stat", NULL};
                int argc = 2;
-               client_open(argc, argv, &st->ct);
+               client_open(argc, argv, &st->ct, NULL);
                set_stat_task_restart_barrier(5);
        }
+       free(stat_item_values[SI_BASENAME]);
+       stat_item_values[SI_BASENAME] = make_message(
+               "%s: no connection to para_server\n",
+               status_item_list[SI_BASENAME]);
+       stat_client_write(stat_item_values[SI_BASENAME],
+               SI_BASENAME);
        st->last_status_read = *now;
 out:
        start_stop_decoders(s);
@@ -1017,6 +1062,38 @@ static void set_initial_status(void)
                PARA_WARNING_LOG("invalid mode\n");
 }
 
+__noreturn static void print_help_and_die(void)
+{
+       int d = conf.detailed_help_given;
+       const char **p = d? audiod_args_info_detailed_help
+               : audiod_args_info_help;
+
+       printf_or_die("%s\n\n", AUDIOD_CMDLINE_PARSER_PACKAGE "-"
+               AUDIOD_CMDLINE_PARSER_VERSION);
+       printf_or_die("%s\n\n", audiod_args_info_usage);
+       for (; *p; p++)
+               printf_or_die("%s\n", *p);
+       print_receiver_helps(d);
+       print_filter_helps(d);
+       print_writer_helps(d);
+       exit(0);
+}
+
+static void init_colors_or_die(void)
+{
+       int ret, i;
+
+       if (!want_colors())
+               return;
+       daemon_set_default_log_colors();
+       daemon_set_flag(DF_COLOR_LOG);
+       for (i = 0; i < conf.log_color_given; i++) {
+               ret = daemon_set_log_color(conf.log_color_arg[i]);
+               if (ret < 0)
+                       exit(EXIT_FAILURE);
+       }
+}
+
 /**
  * the main function of para_audiod
  *
@@ -1029,9 +1106,8 @@ static void set_initial_status(void)
  * */
 int main(int argc, char *argv[])
 {
-       char *config_file;
        int ret, i;
-       struct sched s;
+       static struct sched s;
        struct command_task command_task_struct, *cmd_task = &command_task_struct;
        struct audiod_cmdline_parser_params params = {
                .override = 0,
@@ -1042,30 +1118,31 @@ int main(int argc, char *argv[])
        };
 
        valid_fd_012();
-       audiod_cmdline_parser_ext(argc, argv, &conf, &params);
+       if (audiod_cmdline_parser_ext(argc, argv, &conf, &params))
+               exit(EXIT_FAILURE);
        HANDLE_VERSION_FLAG("audiod", conf);
-       para_drop_privileges(conf.user_arg, conf.group_arg);
-       config_file = configfile_exists();
-       if (config_file) {
-               params.override = 0;
-               params.initialize = 0;
-               params.check_required = 1;
-               params.check_ambiguity = 0;
-               params.print_errors = 1;
-               if (audiod_cmdline_parser_config_file(config_file, &conf, &params)) {
-                       PARA_EMERG_LOG("parse error in config file\n");
-                       exit(EXIT_FAILURE);
-               }
-               free(config_file);
+       /* init receivers/filters/writers early to make help work */
+       recv_init();
+       filter_init();
+       writer_init();
+       if (conf.help_given || conf.detailed_help_given)
+               print_help_and_die();
+       drop_privileges_or_die(conf.user_arg, conf.group_arg);
+       parse_config_or_die();
+       init_colors_or_die();
+       daemon_set_flag(DF_LOG_TIME);
+       daemon_set_flag(DF_LOG_HOSTNAME);
+       daemon_set_flag(DF_LOG_LL);
+       if (conf.logfile_given) {
+               daemon_set_logfile(conf.logfile_arg);
+               daemon_open_log_or_die();
        }
-       if (conf.logfile_given)
-               logfile = open_log(conf.logfile_arg);
-       log_welcome("para_audiod", conf.loglevel_arg);
-       i = init_stream_io();
-       if (i < 0) {
-               PARA_EMERG_LOG("init stream io error: %s\n", para_strerror(-i));
+       ret = parse_stream_args();
+       if (ret < 0) {
+               PARA_EMERG_LOG("%s\n", para_strerror(-ret));
                exit(EXIT_FAILURE);
        }
+       log_welcome("para_audiod");
        server_uptime(UPTIME_SET);
        set_initial_status();
        FOR_EACH_SLOT(i)
@@ -1078,7 +1155,7 @@ int main(int argc, char *argv[])
        init_command_task(cmd_task);
 
        if (conf.daemon_given)
-               daemon_init();
+               daemonize();
 
        register_task(&sig_task->task);
        register_task(&cmd_task->task);