X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttsessiondcomm%2Fliblttsessiondcomm.c;h=cffeb72c0d71f0d9ead2b6a61f4ac78ebf18d875;hb=a8afeb4a77269ca217cb0da0c3bb3232d60a764a;hp=253e63545addf17710baeecc679d37fa05d11aae;hpb=159c7ff4ea99cd808f89787f66a23152483137d4;p=lttng-tools.git

diff --git a/liblttsessiondcomm/liblttsessiondcomm.c b/liblttsessiondcomm/liblttsessiondcomm.c
index 253e63545..cffeb72c0 100644
--- a/liblttsessiondcomm/liblttsessiondcomm.c
+++ b/liblttsessiondcomm/liblttsessiondcomm.c
@@ -115,11 +115,12 @@ int lttcomm_connect_unix_sock(const char *pathname)
 {
 	struct sockaddr_un sun;
 	int fd;
-	int ret = 1;
+	int ret;
 
 	fd = socket(PF_UNIX, SOCK_STREAM, 0);
 	if (fd < 0) {
 		perror("socket");
+		ret = fd;
 		goto error;
 	}
 
@@ -129,14 +130,20 @@ int lttcomm_connect_unix_sock(const char *pathname)
 
 	ret = connect(fd, (struct sockaddr *) &sun, sizeof(sun));
 	if (ret < 0) {
-		perror("connect");
-		goto error;
+		/*
+		 * Don't print message on connect error, because connect
+		 * is used in normal execution to detect if sessiond is
+		 * alive.
+		 */
+		goto error_connect;
 	}
 
 	return fd;
 
+error_connect:
+	close(fd);
 error:
-	return -1;
+	return ret;
 }
 
 /*
@@ -186,6 +193,8 @@ int lttcomm_create_unix_sock(const char *pathname)
 	sun.sun_family = AF_UNIX;
 	strncpy(sun.sun_path, pathname, strlen(pathname));
 
+	/* Unlink the old file if present */
+	(void) unlink(pathname);
 	ret = bind(fd, (struct sockaddr *) &sun, sizeof(sun));
 	if (ret < 0) {
 		perror("bind");
@@ -299,8 +308,8 @@ ssize_t lttcomm_send_fds_unix_sock(int sock, void *buf, int *fds, size_t nb_fd,
 	char tmp[CMSG_SPACE(sizeof_fds)];
 
 	/*
-	 * Note: the consumerd receiver only supports receiving one FD at a
-	 * time for now.
+	 * Note: the consumerd receiver only supports receiving one FD per
+	 * message.
 	 */
 	assert(nb_fd == 1);