X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv_common.c;h=948de4745dda8c62bce88f31ec8362650ae85de0;hp=20b6783218800a3be6d60d1efb8f2252e138a582;hb=ac93cb364106bbaa88bf0d0852981a872166e6a9;hpb=ff12b505b227585daf5aecc822d6b2e8841c2be7;ds=sidebyside diff --git a/recv_common.c b/recv_common.c index 20b67832..948de474 100644 --- a/recv_common.c +++ b/recv_common.c @@ -1,113 +1,120 @@ -/* - * Copyright (C) 2006-2012 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 2006 Andre Noll , see file COPYING. */ /** \file recv_common.c common functions of para_recv and para_audiod */ #include +#include +#include +#include "recv_cmd.lsg.h" #include "para.h" +#include "error.h" #include "list.h" #include "sched.h" -#include "ggo.h" #include "buffer_tree.h" #include "recv.h" #include "string.h" /** * Call the init function of each paraslash receiver. + * + * Receivers employ the user_data feature of the lopsub library: Each receiver + * of the recv_cmd suite defines a struct receiver as its user data. + * recv_init() obtains a pointer to this structure by calling lls_user_data(). + * If the receiver has an init function (i.e., if ->init is not NULL), ->init() + * is called to initialize the receiver. */ void recv_init(void) { int i; - FOR_EACH_RECEIVER(i) - receivers[i].init(&receivers[i]); -} - -static void *parse_receiver_args(int receiver_num, char *options) -{ - struct receiver *r = &receivers[receiver_num]; - char **argv; - int argc; - void *conf; - - if (options) { - argc = create_shifted_argv(options, " \t", &argv); - if (argc < 0) - return NULL; - } else { - argc = 1; - argv = para_malloc(2 * sizeof(char*)); - argv[1] = NULL; + FOR_EACH_RECEIVER(i) { + const struct lls_command *cmd = RECV_CMD(i); + const struct receiver *r = lls_user_data(cmd); + if (r && r->init) + r->init(); } - argv[0] = make_message("%s_recv", r->name); - conf = r->parse_config(argc, argv); - free_argv(argv); - return conf; } /** - * check if given string is a valid command line for any receiver + * Check if the given string is a valid receiver specifier. + * + * \param ra string of the form receiver_name [options...] + * \param lprp Filled in on success, undefined else. * - * \param \ra string of the form receiver_name:options - * \param receiver_num contains the number of the receiver upon success + * This function checks whether \a ra starts with the name of a receiver, + * optionally followed by options for that receiver. If a valid receiver name + * was found the remaining part of \a ra is passed to the receiver's config + * parser. * - * This function checks whether \a ra starts with the name of a supported - * paraslash receiver, optinally followed by a colon and any options for that - * receiver. If a valid receiver name was found and further are present, the - * remaining part of \a ra is passed to that receiver's config parser. + * If a NULL pointer or an empty string is passed as the first argument, the + * hhtp receiver with no options is assumed. * - * \return On success, a pointer to the gengetopt args info struct is returned - * and \a receiver_num contains the number of the receiver. Otherwise this function - * returns \p NULL. + * \return On success the number of the receiver is returned. On errors, the + * function calls exit(EXIT_FAILURE). */ -void *check_receiver_arg(char *ra, int *receiver_num) +int check_receiver_arg(const char *ra, struct lls_parse_result **lprp) { - int j; + int ret, argc, receiver_num; + char *errctx = NULL, **argv; + const struct lls_command *cmd; - PARA_DEBUG_LOG("checking %s\n", ra); - for (j = 0; receivers[j].name; j++) { - const char *name = receivers[j].name; - size_t len = strlen(name); - char c; - if (strlen(ra) < len) - continue; - if (strncmp(name, ra, len)) - continue; - c = ra[len]; - if (c && c != ' ') - continue; - if (c && !receivers[j].parse_config) - return NULL; - *receiver_num = j; - return parse_receiver_args(j, c? ra + len + 1: NULL); + *lprp = NULL; + if (!ra || !*ra) { + argc = 1; + argv = para_malloc(2 * sizeof(char*)); + argv[0] = para_strdup("http"); + argv[1] = NULL; + } else { + ret = create_argv(ra, " \t\n", &argv); + if (ret < 0) { + PARA_EMERG_LOG("%s\n", para_strerror(-ret)); + exit(EXIT_FAILURE); + } + argc = ret; } - PARA_ERROR_LOG("receiver not found\n"); - return NULL; + ret = lls(lls_lookup_subcmd(argv[0], recv_cmd_suite, &errctx)); + if (ret < 0) { + PARA_EMERG_LOG("%s: %s\n", errctx? errctx : argv[0], + para_strerror(-ret)); + exit(EXIT_FAILURE); + } + receiver_num = ret; + cmd = RECV_CMD(receiver_num); + ret = lls(lls_parse(argc, argv, cmd, lprp, &errctx)); + if (ret < 0) { + if (errctx) + PARA_ERROR_LOG("%s\n", errctx); + PARA_EMERG_LOG("%s\n", para_strerror(-ret)); + exit(EXIT_FAILURE); + } + ret = receiver_num; + free_argv(argv); + return ret; } /** * Print out the help texts to all receivers. * - * \param detailed Whether the detailed help should be printed. + * \param detailed Whether to print the short or the detailed help. */ -void print_receiver_helps(int detailed) +void print_receiver_helps(bool detailed) { int i; - printf_or_die("\nAvailable receivers: \n\t"); - FOR_EACH_RECEIVER(i) - printf_or_die("%s%s", i? " " : "", receivers[i].name); - printf_or_die("\n\n"); + printf("\nAvailable receivers: "); + FOR_EACH_RECEIVER(i) { + const struct lls_command *cmd = RECV_CMD(i); + printf("%s%s", i? " " : "", lls_command_name(cmd)); + } + printf("\n\n"); FOR_EACH_RECEIVER(i) { - struct receiver *r = receivers + i; - if (!r->help.short_help) + const struct lls_command *cmd = RECV_CMD(i); + char *help = detailed? lls_long_help(cmd) : lls_short_help(cmd); + if (!help) continue; - printf_or_die("Options for %s:\n", r->name); - ggo_print_help(&r->help, detailed); + printf("%s\n", help); + free(help); } } @@ -115,7 +122,7 @@ void print_receiver_helps(int detailed) * Simple pre-select hook, used by all receivers. * * \param s Scheduler info. - * \param t Determines the receiver node. + * \param rn The receiver node. * * This requests a minimal delay from the scheduler if the status of the buffer * tree node indicates an error/eof condition. No file descriptors are added to @@ -124,12 +131,10 @@ void print_receiver_helps(int detailed) * \return The status of the btr node of the receiver node, i.e. the return * value of the underlying call to \ref btr_node_status(). */ -int generic_recv_pre_select(struct sched *s, struct task *t) +int generic_recv_pre_select(struct sched *s, struct receiver_node *rn) { - struct receiver_node *rn = container_of(t, struct receiver_node, task); int ret = btr_node_status(rn->btrn, 0, BTR_NT_ROOT); - t->error = 0; if (ret < 0) sched_min_delay(s); return ret;