Use sideband also for challenge response.
[paraslash.git] / recv.c
diff --git a/recv.c b/recv.c
index aaccb06ac77fcd7bded8ffc46c300039227eabe1..f14ea2876fba05a4b8196c4dcafbcf968de32644 100644 (file)
--- a/recv.c
+++ b/recv.c
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
- *     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.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
-#include "gcc-compat.h"
-#include "para.h"
 
+/** \file recv.c the stand-alone audio stream receiver */
+
+#include <regex.h>
+#include <sys/types.h>
+
+#include "para.h"
+#include "list.h"
+#include "sched.h"
+#include "ggo.h"
 #include "recv.h"
 #include "recv.cmdline.h"
+#include "fd.h"
+#include "string.h"
 #include "error.h"
+#include "stdout.h"
+#include "buffer_tree.h"
+#include "version.h"
 
-struct gengetopt_args_info conf;
+/** The gengetopt args info struct. */
+static struct recv_args_info conf;
 
+static int loglevel;
+/** Always log to stderr. */
+INIT_STDERR_LOGGING(loglevel);
+
+/** init array of error codes used by para_recv */
 INIT_RECV_ERRLISTS;
 
-__printf_2_3 void para_log(int ll, char* fmt,...)
+__noreturn static void print_help_and_die(void)
 {
-       va_list argp;
+       int d = conf.detailed_help_given;
+       const char **p = d? recv_args_info_detailed_help
+               : recv_args_info_help;
 
-       /* ignore log message if loglevel is not high enough */
-       if (ll < conf.loglevel_arg)
-               return;
-       va_start(argp, fmt);
-       vfprintf(stderr, fmt, argp);
-       va_end(argp);
+       printf_or_die("%s\n\n", RECV_CMDLINE_PARSER_PACKAGE "-"
+               RECV_CMDLINE_PARSER_VERSION);
+       printf_or_die("%s\n\n", recv_args_info_usage);
+       for (; *p; p++)
+               printf_or_die("%s\n", *p);
+       print_receiver_helps(d);
+       exit(0);
 }
 
 static void *parse_config(int argc, char *argv[], int *receiver_num)
 {
-       int i;
-
-       if (cmdline_parser(argc, argv, &conf))
+       if (recv_cmdline_parser(argc, argv, &conf))
                return NULL;
-       if (conf.list_receivers_given) {
-               printf("available receivers: ");
-               for (i = 0; receivers[i].name; i++)
-                       printf("%s%s", i? " " : "", receivers[i].name);
-               printf("\nTry para_recv -r<receivername>:-h for help on <receivername>\n");
-               exit(EXIT_SUCCESS);
-       }
+       HANDLE_VERSION_FLAG("recv", conf);
+       if (conf.help_given || conf.detailed_help_given)
+               print_help_and_die();
+       loglevel = get_loglevel_by_name(conf.loglevel_arg);
        return check_receiver_arg(conf.receiver_arg, receiver_num);
 }
 
+/**
+ * The main function of para_recv.
+ *
+ * \param argc number of arguments
+ * \param argv vector of arguments
+ *
+ * para_recv uses the specified receiver to receive an audio stream sent by
+ * para_server. The received data is written to stdout.
+ *
+ * \return \a EXIT_SUCCESS on success, \a EXIT_FAILURE on errors.
+ */
 int main(int argc, char *argv[])
 {
-       int ret, eof = 0, max, r_opened = 0, receiver_num;
-       struct timeval timeout;
-       struct  receiver *r = NULL;
-       fd_set rfds, wfds;
+       int ret, r_opened = 0, receiver_num;
+       struct receiver *r = NULL;
        struct receiver_node rn;
+       struct stdout_task sot;
+       static struct sched s;
+
+       s.default_timeout.tv_sec = 1;
+       s.default_timeout.tv_usec = 0;
 
+       memset(&sot, 0, sizeof(struct stdout_task));
        memset(&rn, 0, sizeof(struct receiver_node));
-       for (ret = 0; receivers[ret].name; ret++)
-               receivers[ret].init(&receivers[ret]);
+       recv_init();
        ret = -E_RECV_SYNTAX;
        rn.conf = parse_config(argc, argv, &receiver_num);
        if (!rn.conf) {
-               PARA_EMERG_LOG("%s", "parse failed\n");
+               PARA_EMERG_LOG("parse failed\n");
                goto out;
        }
        r = &receivers[receiver_num];
        rn.receiver = r;
+       rn.btrn = btr_new_node(&(struct btr_node_description)
+               EMBRACE(.name = r->name));
        ret = r->open(&rn);
        if (ret < 0)
                goto out;
        r_opened = 1;
-recv:
-       FD_ZERO(&rfds);
-       FD_ZERO(&wfds);
-       timeout.tv_sec = 0;
-       timeout.tv_usec = 1000 * 1000;
-       max = -1;
-       ret = r->pre_select(&rn, &rfds, &wfds, &timeout);
-       max = MAX(max, ret);
 
-       PARA_DEBUG_LOG("timeout: %lums\n", tv2ms(&timeout));
-       ret = select(max + 1, &rfds, &wfds, NULL, &timeout);
-       if (ret < 0) {
-               if (errno == EINTR || errno == EAGAIN)
-                       goto recv;
-               ret = -E_RECV_SELECT;
-               goto out;
-       }
-       ret = r->post_select(&rn, ret, &rfds, &wfds);
-       if (ret < 0)
-               goto out;
-       if (!ret)
-               eof = 1;
-       if (!rn.loaded) {
-               if (eof)
-                       goto out;
-               goto recv;
-       }
-       ret = write(STDOUT_FILENO, rn.buf, rn.loaded);
-       PARA_DEBUG_LOG("wrote %d/%d\n", ret, rn.loaded);
-       if (ret < 0) {
-               ret = -E_WRITE_STDOUT;
-               goto out;
-       }
-       if (ret != rn.loaded) {
-               PARA_INFO_LOG("short write %d/%d\n", ret, rn.loaded);
-               memmove(rn.buf, rn.buf + ret, rn.loaded - ret);
-       }
-       rn.loaded -= ret;
-       if (rn.loaded || !eof)
-               goto recv;
+       sot.btrn = btr_new_node(&(struct btr_node_description)
+               EMBRACE(.parent = rn.btrn, .name = "stdout"));
+       stdout_set_defaults(&sot);
+       register_task(&s, &sot.task);
+
+       rn.task.pre_select = r->pre_select;
+       rn.task.post_select = r->post_select;
+       sprintf(rn.task.status, "%s", r->name);
+       register_task(&s, &rn.task);
+
+       ret = schedule(&s);
 out:
        if (r_opened)
                r->close(&rn);
-       if (r)
-               r->shutdown();
+       btr_free_node(rn.btrn);
+       btr_free_node(sot.btrn);
+       if (rn.conf)
+               r->free_config(rn.conf);
        if (ret < 0)
-               PARA_NOTICE_LOG("%d: (%s)\n", ret, PARA_STRERROR(-ret));
-       return ret;
+               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+       return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }