gui: Use variable-sized input buffer for the audiod pipe.
[paraslash.git] / audioc.c
index 5531426..5c081da 100644 (file)
--- a/audioc.c
+++ b/audioc.c
@@ -1,43 +1,30 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 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.
  */
 
 /** \file audioc.c the client program used to connect to para_audiod */
 
+#include <sys/types.h>
+#include <dirent.h>
+
 #include "audioc.cmdline.h"
 #include "para.h"
+#include "error.h"
 #include "net.h"
 #include "string.h"
 #include "fd.h"
 
-struct gengetopt_args_info conf;
-char *tmpfifo;
-enum {E_SYNTAX, E_READ, E_WRITE, E_SOCKET, E_INIT_SOCK_ADDR, E_CONNECT, E_CREDENTIALS, E_SELECT, E_OVERRUN};
+INIT_AUDIOC_ERRLISTS;
 
+/** the gengetopt structure containing command line args */
+struct audioc_args_info conf;
 
-void para_log(__a_unused int ll, __a_unused const char* fmt,...) /* no logging */
-{
-}
+static int loglevel;
+INIT_STDERR_LOGGING(loglevel);
 
-/* audioc does not use encryption */
-void (*crypt_function_recv)(unsigned long len, const unsigned char *indata, unsigned char *outdata) = NULL;
-void (*crypt_function_send)(unsigned long len, const unsigned char *indata, unsigned char *outdata) = NULL;
-
-static char *concat_args(const int argc, char * const *argv)
+static char *concat_args(unsigned argc, char * const *argv)
 {
        int i; char *buf = NULL;
        for (i = 0; i < argc; i++) {
@@ -51,7 +38,7 @@ static char *concat_args(const int argc, char * const *argv)
 static char *configfile_exists(void)
 {
        static char *config_file;
-        struct stat statbuf;
+       struct stat statbuf;
 
 
        if (!config_file) {
@@ -59,57 +46,76 @@ static char *configfile_exists(void)
                config_file = make_message("%s/.paraslash/audioc.conf", home);
                free(home);
        }
-        if (!stat(config_file, &statbuf))
+       if (!stat(config_file, &statbuf))
                return config_file;
        return NULL;
 }
 
+/**
+ * the client program to connect to para_audiod
+ *
+ * \param argc usual argument count
+ * \param argv usual argument vector
+ *
+ * It creates a temporary local socket in order to communicate with para_audiod.
+ * Authentication consists in sending a ucred buffer that contains the user id.
+ *
+ * Any output received through the local socket is sent to stdout.
+ *
+ * \return EXIT_SUCCESS or EXIT_FAILURE
+ *
+ * \sa send_cred_buffer(), para_audioc(1), para_audiod(1).
+ */
 int main(int argc, char *argv[])
 {
-       struct sockaddr_un unix_addr;
-       int ret = -E_SYNTAX, fd, loaded = 0;
-       char *cf, *socket_name, *randname = para_tmpname(), *tmpsocket_name = NULL,
-               *buf = NULL, *hn = para_hostname(), *args, *home = para_homedir();
-
+       int ret = -E_AUDIOC_SYNTAX, fd;
+       char *cf, *buf = NULL, *args;
+       size_t bufsize, loaded = 0;
 
-       if (cmdline_parser(argc, argv, &conf))
+       if (audioc_cmdline_parser(argc, argv, &conf))
                goto out;
+       HANDLE_VERSION_FLAG("audioc", conf);
        cf = configfile_exists();
        if (cf) {
-               if (cmdline_parser_configfile(cf, &conf, 0, 0, 0)) {
+               struct audioc_cmdline_parser_params params = {
+                       .override = 0,
+                       .initialize = 0,
+                       .check_required = 0,
+                       .check_ambiguity = 0
+               };
+               if (audioc_cmdline_parser_config_file(cf, &conf, &params)) {
                        fprintf(stderr, "parse error in config file\n");
                        exit(EXIT_FAILURE);
                }
        }
+       loglevel = get_loglevel_by_name(conf.loglevel_arg);
        args = conf.inputs_num?
                concat_args(conf.inputs_num, conf.inputs) :
                para_strdup("stat");
-       buf = para_malloc(conf.bufsize_arg);
-       if (conf.socket_given)
-               socket_name = para_strdup(conf.socket_arg);
-       else
-               socket_name = make_message(
-                       "/var/paraslash/audiod_socket.%s", hn);
-       if (conf.tmpdir_given)
-               tmpsocket_name = make_message("%s/audioc.sock.%s.%s",
-                       conf.tmpdir_arg, hn, randname);
-       else
-               tmpsocket_name = make_message("%s/.paraslash/audioc_sock.%s.%s",
-                       home, hn, randname);
+       bufsize = conf.bufsize_arg;
+       buf = para_malloc(bufsize);
 
-       ret = -E_SOCKET;
-       fd = create_pf_socket(tmpsocket_name, &unix_addr, S_IRUSR | S_IWUSR);
-       unlink(tmpsocket_name);
-       if (fd < 0)
+       if (conf.socket_given) {
+               ret = create_remote_socket(conf.socket_arg);
+       } else {
+               char *hn = para_hostname(),
+                    *socket_name = make_message("/var/paraslash/audiod_socket.%s", hn);
+
+               ret = create_remote_socket(socket_name);
+               free(hn);
+               free(socket_name);
+       }
+       if (ret < 0)
                goto out;
-       ret = -E_INIT_SOCK_ADDR;
-       if (init_unix_addr(&unix_addr, socket_name) < 0)
+       fd = ret;
+       ret = mark_fd_nonblocking(fd);
+       if (ret < 0)
                goto out;
-       ret = - E_CONNECT;
-       if (connect(fd, (struct sockaddr *)&unix_addr, UNIX_PATH_MAX) < 0)
+       ret = mark_fd_nonblocking(STDOUT_FILENO);
+       if (ret < 0)
                goto out;
-       ret = -E_CREDENTIALS;
-       if (send_cred_buffer(fd, args) < 0)
+       ret = send_cred_buffer(fd, args);
+       if (ret < 0)
                goto out;
        for (;;) {
                int max_fileno = -1, check_write = 0;
@@ -117,30 +123,23 @@ int main(int argc, char *argv[])
                fd_set rfd, wfd;
                FD_ZERO(&rfd);
                FD_ZERO(&wfd);
-               if (loaded && loaded > 10000)
-                       fprintf(stderr, "loaded: %d\n", loaded);
-               if (loaded < conf.bufsize_arg) {
-                       FD_SET(fd, &rfd);
-                       max_fileno = MAX(max_fileno, fd);
-               }
+               if (loaded < bufsize)
+                       para_fd_set(fd, &rfd, &max_fileno);
                if (loaded > 0) {
-                       FD_SET(STDOUT_FILENO, &wfd);
-                       max_fileno = MAX(max_fileno, STDOUT_FILENO);
+                       para_fd_set(STDOUT_FILENO, &wfd, &max_fileno);
                        check_write = 1;
                }
-               ret = -E_OVERRUN;
+               ret = -E_AUDIOC_OVERRUN;
                if (max_fileno < 0)
                        goto out;
                ret = para_select(max_fileno + 1, &rfd, &wfd, NULL);
-               if (ret < 0) {
-                       ret = -E_SELECT;
+               if (ret < 0)
                        goto out;
-               }
-               if (loaded < conf.bufsize_arg && FD_ISSET(fd, &rfd)) {
-                       len = recv_bin_buffer(fd, buf + loaded, 
-                               conf.bufsize_arg - loaded);
+               if (loaded < bufsize && FD_ISSET(fd, &rfd)) {
+                       len = recv_bin_buffer(fd, buf + loaded,
+                               bufsize - loaded);
                        if (len <= 0) {
-                               ret = len < 0? -E_READ : 0;
+                               ret = len < 0? -E_AUDIOC_READ : 0;
                                goto out;
                        }
                        loaded += len;
@@ -148,14 +147,18 @@ int main(int argc, char *argv[])
                if (check_write && FD_ISSET(STDOUT_FILENO, &wfd)) {
                        ret = write(STDOUT_FILENO, buf, loaded);
                        if (ret < 0) {
-                               ret = -E_WRITE;
+                               ret = -E_AUDIOC_WRITE;
                                goto out;
                        }
                        loaded -= ret;
+                       if (loaded && ret)
+                               memmove(buf, buf + ret, loaded);
                }
        }
 out:
        if (!ret && loaded && buf)
                ret = write(STDOUT_FILENO, buf, loaded);
-       return ret < 0? -ret : EXIT_SUCCESS;
+       if (ret < 0)
+               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+       return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }