X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Finet.c;h=35ce3b6b5c9ca2a720a509d3d95aa172931a221a;hp=cf06ecb858d2079455c7a009f888435b6532d6c4;hb=14b88ccfe8d51fe8a19e525d8b6a5e4614eccb46;hpb=71c648d8989148e1e80a0d676b468571fa31e274

diff --git a/src/common/sessiond-comm/inet.c b/src/common/sessiond-comm/inet.c
index cf06ecb85..35ce3b6b5 100644
--- a/src/common/sessiond-comm/inet.c
+++ b/src/common/sessiond-comm/inet.c
@@ -15,7 +15,7 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <limits.h>
 #include <stdio.h>
@@ -103,7 +103,7 @@ int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
 {
 	int ret;
 
-	ret = bind(sock->fd, &sock->sockaddr.addr.sin,
+	ret = bind(sock->fd, (const struct sockaddr *) &sock->sockaddr.addr.sin,
 			sizeof(sock->sockaddr.addr.sin));
 	if (ret < 0) {
 		PERROR("bind inet");
@@ -305,11 +305,11 @@ struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
 
 		ret = lttcomm_setsockopt_rcv_timeout(new_fd, timeout);
 		if (ret) {
-			goto error;
+			goto error_close;
 		}
 		ret = lttcomm_setsockopt_snd_timeout(new_fd, timeout);
 		if (ret) {
-			goto error;
+			goto error_close;
 		}
 	}
 
@@ -319,6 +319,11 @@ struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
 end:
 	return new_sock;
 
+error_close:
+	if (close(new_fd) < 0) {
+		PERROR("accept inet close fd");
+	}
+
 error:
 	free(new_sock);
 	return NULL;