X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audioc.c;h=0036da83144bc180d1f3df104f93e4276caaf1b7;hp=d98ab46003c71912099d46b366fbdcaa294e77d5;hb=8d7f47e8cec74e4d209cfa1f6c4c0cec3b0e5019;hpb=8211954fc3390c0fa19cca788b03336a37aa9dc0

diff --git a/audioc.c b/audioc.c
index d98ab460..0036da83 100644
--- a/audioc.c
+++ b/audioc.c
@@ -6,12 +6,15 @@
 
 /** \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"
-#include "error.h"
 
 INIT_AUDIOC_ERRLISTS;
 
@@ -64,11 +67,10 @@ static char *configfile_exists(void)
  */
 int main(int argc, char *argv[])
 {
-	struct sockaddr_un unix_addr;
 	int ret = -E_AUDIOC_SYNTAX, fd;
-	char *cf, *socket_name, *randname = para_tmpname(), *tmpsocket_name = NULL,
-		*buf = NULL, *hn = para_hostname(), *args, *home = para_homedir();
+	char *cf, *buf = NULL, *args;
 	size_t bufsize, loaded = 0;
+	struct sockaddr_un unix_addr;
 
 	if (audioc_cmdline_parser(argc, argv, &conf))
 		goto out;
@@ -91,29 +93,23 @@ int main(int argc, char *argv[])
 		para_strdup("stat");
 	bufsize = conf.bufsize_arg;
 	buf = para_malloc(bufsize);
-	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);
-
-	ret = create_local_socket(tmpsocket_name, &unix_addr, S_IRUSR | S_IWUSR);
-	unlink(tmpsocket_name);
-	free(tmpsocket_name);
+	ret = get_stream_socket(PF_UNIX);
 	if (ret < 0)
 		goto out;
 	fd = ret;
-	ret = -E_INIT_SOCK_ADDR;
-	if (init_unix_addr(&unix_addr, socket_name) < 0)
+	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);
+		free(hn);
+		ret = init_unix_addr(&unix_addr, socket_name);
+		free(socket_name);
+	}
+	if (ret < 0)
 		goto out;
-	ret = -E_AUDIOC_CONNECT;
-	if (connect(fd, (struct sockaddr *)&unix_addr, UNIX_PATH_MAX) < 0) /* FIXME: Use para_connect() */
+	ret = PARA_CONNECT(fd, &unix_addr);
+	if (ret < 0)
 		goto out;
 	ret = send_cred_buffer(fd, args);
 	if (ret < 0)