http_send.c: Only pass the fd to host_in_access_perm_list().

[paraslash.git] / audioc.c

diff --git a/audioc.c b/audioc.c
index 0036da83144bc180d1f3df104f93e4276caaf1b7..1402b64c492f24883e63d7391cee6cada4715591 100644 (file)
--- a/audioc.c
+++ b/audioc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -70,7 +70,6 @@ int main(int argc, char *argv[])
        int ret = -E_AUDIOC_SYNTAX, fd;
        char *cf, *buf = NULL, *args;
        size_t bufsize, loaded = 0;
-       struct sockaddr_un unix_addr;
 
        if (audioc_cmdline_parser(argc, argv, &conf))
                goto out;
@@ -93,24 +92,21 @@ int main(int argc, char *argv[])
                para_strdup("stat");
        bufsize = conf.bufsize_arg;
        buf = para_malloc(bufsize);
-       ret = get_stream_socket(PF_UNIX);
-       if (ret < 0)
-               goto out;
-       fd = ret;
-       if (conf.socket_given)
-               ret = init_unix_addr(&unix_addr, conf.socket_arg);
-       else {
-               char *hn = para_hostname(), *socket_name = make_message(
-                       "/var/paraslash/audiod_socket.%s", hn);
+
+       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);
-               ret = init_unix_addr(&unix_addr, socket_name);
                free(socket_name);
        }
        if (ret < 0)
                goto out;
-       ret = PARA_CONNECT(fd, &unix_addr);
-       if (ret < 0)
-               goto out;
+       fd = ret;
+
        ret = send_cred_buffer(fd, args);
        if (ret < 0)
                goto out;
@@ -154,6 +150,6 @@ out:
        if (!ret && loaded && buf)
                ret = write(STDOUT_FILENO, buf, loaded);
        if (ret < 0)
-               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
        return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }