X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=3a39027523a72c686d997d1b358912dc5dfd2363;hp=35b76b5f6fa277ea2aa55656f557b32ef36b5585;hb=c257c9c321c6e9494dbcbb6da0af675c3a2aa8e4;hpb=28954781dc61c24189492be040bcdce5372ead51 diff --git a/audiod_command.c b/audiod_command.c index 35b76b5f..3a390275 100644 --- a/audiod_command.c +++ b/audiod_command.c @@ -1,16 +1,22 @@ /* - * Copyright (C) 2005-2012 Andre Noll + * Copyright (C) 2005 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file audiod_command.c Commands for para_audiod. */ +#include +#include #include #include +#include +#include +#include #include "para.h" #include "audiod.cmdline.h" +#include "audiod.command_list.h" #include "list.h" #include "sched.h" #include "ggo.h" @@ -24,13 +30,34 @@ #include "string.h" #include "write.h" #include "fd.h" -#include "audiod_command_list.h" +#include "version.h" extern struct sched sched; extern char *stat_item_values[NUM_STAT_ITEMS]; +typedef int audiod_command_handler_t(int, int, char **); +static audiod_command_handler_t AUDIOD_COMMAND_HANDLERS; + +/* Defines one command of para_audiod. */ +struct audiod_command { + const char *name; + /* Pointer to the function that handles the command. */ + /* + * Command handlers must never never close their file descriptor. A + * positive return value tells audiod that the status items have + * changed. In this case audiod will send an updated version of all + * status items to to each connected stat client. + */ + audiod_command_handler_t *handler; + /* One-line description. */ + const char *description; + /* Summary of the command line options. */ + const char *usage; + /* The long help text. */ + const char *help; +}; -struct audiod_command audiod_cmds[] = {DEFINE_AUDIOD_CMD_ARRAY}; +static struct audiod_command audiod_cmds[] = {DEFINE_AUDIOD_CMD_ARRAY}; /** Iterate over the array of all audiod commands. */ #define FOR_EACH_COMMAND(c) for (c = 0; audiod_cmds[c].name; c++) @@ -57,7 +84,7 @@ struct stat_client { int fd; /** Bitmask of those status items the client is interested in. */ uint64_t item_mask; - /** See \ref stat_client flags. s*/ + /** See \ref stat_client flags. */ unsigned flags; /** Its entry in the list of stat clients. */ struct list_head node; @@ -92,15 +119,19 @@ static void dump_stat_client_list(void) static int stat_client_add(int fd, uint64_t mask, int parser_friendly) { struct stat_client *new_client; + int ret; if (num_clients >= MAX_STAT_CLIENTS) { PARA_ERROR_LOG("maximal number of stat clients (%d) exceeded\n", MAX_STAT_CLIENTS); return -E_TOO_MANY_CLIENTS; } - PARA_INFO_LOG("adding client on fd %d\n", fd); - new_client = para_calloc(sizeof(struct stat_client)); - new_client->fd = fd; + ret = dup(fd); + if (ret < 0) + return -ERRNO_TO_PARA_ERROR(errno); + new_client = para_calloc(sizeof(*new_client)); + new_client->fd = ret; + PARA_INFO_LOG("adding client on fd %d\n", new_client->fd); new_client->item_mask = mask; if (parser_friendly) new_client->flags = SCF_PARSER_FRIENDLY; @@ -109,6 +140,31 @@ static int stat_client_add(int fd, uint64_t mask, int parser_friendly) num_clients++; return 1; } + +static void close_stat_client(struct stat_client *sc) +{ + PARA_INFO_LOG("closing client fd %d\n", sc->fd); + close(sc->fd); + list_del(&sc->node); + free(sc); + num_clients--; +} + +/** + * Empty the status clients list. + * + * This iterates over the list of connected status clients, closes each client + * file descriptor and frees the resources. + */ +void close_stat_clients(void) +{ + struct stat_client *sc, *tmp; + + list_for_each_entry_safe(sc, tmp, &client_list, node) + close_stat_client(sc); + assert(num_clients == 0); +} + /** * Write a message to all connected status clients. * @@ -127,23 +183,18 @@ void stat_client_write_item(int item_num) struct para_buffer *b; list_for_each_entry_safe(sc, tmp, &client_list, node) { - int fd = sc->fd, ret; + int ret; if (!((one << item_num) & sc->item_mask)) continue; b = (sc->flags & SCF_PARSER_FRIENDLY)? &pfpb : &pb; if (!b->buf) - (void)WRITE_STATUS_ITEM(b, item_num, "%s\n", - msg? msg : ""); - ret = write(fd, b->buf, b->offset); + WRITE_STATUS_ITEM(b, item_num, "%s\n", msg? msg : ""); + ret = write(sc->fd, b->buf, b->offset); if (ret == b->offset) continue; /* write error or short write */ - close(fd); - num_clients--; - PARA_INFO_LOG("deleting client on fd %d\n", fd); - list_del(&sc->node); - free(sc); + close_stat_client(sc); dump_stat_client_list(); } free(pb.buf); @@ -189,46 +240,6 @@ __malloc static char *audiod_status_string(void) return para_strdup(status); } -static int get_play_time_slot_num(void) -{ - int i, oldest_slot = -1; - struct timeval oldest_wstime = {0, 0}; - - FOR_EACH_SLOT(i) { - struct slot_info *s = &slot[i]; - struct timeval wstime; - if (!s->wns || !s->wns[0].btrn) - continue; - btr_get_node_start(s->wns[0].btrn, &wstime); - if (oldest_slot >= 0 && tv_diff(&wstime, &oldest_wstime, NULL) > 0) - continue; - oldest_wstime = wstime; - oldest_slot = i; - } - //PARA_CRIT_LOG("oldest slot: %d\n", oldest_slot); - return oldest_slot; -} - -__malloc static char *decoder_flags(void) -{ - int i; - char 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->fns) - flag += 2; - if (s->wns) - flag += 4; - flags[i] = flag; - } - flags[MAX_STREAM_SLOTS] = '\0'; - return para_strdup(flags); -} - static int dump_commands(int fd) { char *buf = para_strdup(""), *tmp = NULL; @@ -246,17 +257,10 @@ static int dump_commands(int fd) 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); @@ -278,25 +282,22 @@ static int com_help(int fd, int argc, char **argv) free(buf); goto out; } - ret = client_write(fd, dflt); + ret = client_write(fd, "No such command. Available commands:\n"); if (ret > 0) ret = dump_commands(fd); out: - if (ret >= 0) - close(fd); - return ret; + return ret < 0? ret : 0; } static int com_tasks(int fd, __a_unused int argc, __a_unused char **argv) { char *tl = get_task_list(&sched); int ret = 1; + if (tl) ret = client_write(fd, tl); free(tl); - if (ret > 0) - close(fd); - return ret; + return ret < 0? ret : 0; } static int com_stat(int fd, int argc, char **argv) @@ -320,7 +321,6 @@ static int com_stat(int fd, int argc, char **argv) if (!strncmp(arg, "-p", 2)) { parser_friendly = 1; b.flags = PBF_SIZE_PREFIX; - continue; } } if (i >= argc) @@ -336,48 +336,45 @@ static int com_stat(int fd, int argc, char **argv) char *item = stat_item_values[i]; if (!((one << i) & mask)) continue; - (void)WRITE_STATUS_ITEM(&b, i, "%s\n", item? item : ""); + WRITE_STATUS_ITEM(&b, i, "%s\n", item? item : ""); } ret = client_write(fd, b.buf); if (ret >= 0) ret = stat_client_add(fd, mask, parser_friendly); free(b.buf); - return ret; + return ret < 0? ret : 0; } static int com_grab(int fd, int argc, char **argv) { - return grab_client_new(fd, argc, argv, &sched); + int ret = grab_client_new(fd, argc, argv, &sched); + return ret < 0? ret : 0; } -__noreturn static int com_term(int fd, __a_unused int argc, __a_unused char **argv) +static int com_term(__a_unused int fd, __a_unused int argc, __a_unused char **argv) { - close(fd); - clean_exit(EXIT_SUCCESS, "terminating on user request"); + return -E_AUDIOD_TERM; } -static int com_on(int fd, __a_unused int argc, __a_unused char **argv) +static int com_on(__a_unused 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) +static int com_off(__a_unused 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) +static int com_sb(__a_unused 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) +static int com_cycle(__a_unused int fd, int argc, char **argv) { switch (audiod_status) { case AUDIOD_ON: @@ -390,20 +387,21 @@ static int com_cycle(int fd, int argc, char **argv) return com_off(fd, argc, argv); break; } - close(fd); return 1; } -static int check_perms(uid_t uid) +static int com_version(int fd, int argc, char **argv) { - 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 ret; + char *msg; + + if (argc > 1 && strcmp(argv[1], "-v") == 0) + msg = make_message("%s", version_text("audiod")); + else + msg = make_message("%s\n", version_single_line("audiod")); + ret = client_write(fd, msg); + free(msg); + return ret < 0? ret : 0; } /** @@ -437,12 +435,12 @@ int handle_connect(int accept_fd, fd_set *rfds) if (ret < 0) goto out; uid = ret; - PARA_INFO_LOG("connection from user %i, buf: %s\n", ret, buf); - ret = check_perms(uid); - if (ret < 0) + PARA_INFO_LOG("connection from UID %d, buf: %s\n", ret, buf); + ret = -E_UCRED_PERM; + if (!uid_is_whitelisted(uid)) goto out; ret = create_argv(buf, "\n", &argv); - if (ret < 0) + if (ret <= 0) goto out; argc = ret; //PARA_INFO_LOG("argv[0]: %s, argc = %d\n", argv[0], argc); @@ -455,27 +453,28 @@ int handle_connect(int accept_fd, fd_set *rfds) ret = -E_INVALID_AUDIOD_CMD; out: free_argv(argv); - if (clifd > 0 && ret < 0 && ret != -E_CLIENT_WRITE) { + if (ret < 0 && ret != -E_CLIENT_WRITE) { char *tmp = make_message("%s\n", para_strerror(-ret)); client_write(clifd, tmp); free(tmp); - close(clifd); } + close(clifd); return ret; } /** * Send the current audiod status to all connected stat clients. + * + * \param force Whether to write unchanged items. */ -void audiod_status_dump(void) +void audiod_status_dump(bool force) { - int slot_num = get_play_time_slot_num(); char *old, *new; old = stat_item_values[SI_PLAY_TIME]; - new = get_time_string(slot_num); + new = get_time_string(); if (new) { - if (!old || strcmp(old, new)) { + if (force || !old || strcmp(old, new)) { free(old); stat_item_values[SI_PLAY_TIME] = new; stat_client_write_item(SI_PLAY_TIME); @@ -483,9 +482,9 @@ void audiod_status_dump(void) free(new); } - new = get_server_uptime_str(now); + new = daemon_get_uptime_str(now); old = stat_item_values[SI_AUDIOD_UPTIME]; - if (!old || strcmp(old, new)) { + if (force || !old || strcmp(old, new)) { free(old); stat_item_values[SI_AUDIOD_UPTIME] = new; stat_client_write_item(SI_AUDIOD_UPTIME); @@ -494,7 +493,7 @@ void audiod_status_dump(void) old = stat_item_values[SI_AUDIOD_STATUS]; new = audiod_status_string(); - if (!old || strcmp(old, new)) { + if (force || !old || strcmp(old, new)) { free(old); stat_item_values[SI_AUDIOD_STATUS] = new; stat_client_write_item(SI_AUDIOD_STATUS); @@ -502,8 +501,8 @@ void audiod_status_dump(void) free(new); old = stat_item_values[SI_DECODER_FLAGS]; - new = decoder_flags(); - if (!old || strcmp(old, new)) { + new = audiod_get_decoder_flags(); + if (force || !old || strcmp(old, new)) { free(old); stat_item_values[SI_DECODER_FLAGS] = new; stat_client_write_item(SI_DECODER_FLAGS);