X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Finet6.c;h=66a4b552f25e659589435485b7bd88eb609d1e07;hp=03b6627d1dce45188d28d81d234cb2c208c062eb;hb=1a65bbb8755fa1ae4a013bc1aa94c39297b8779e;hpb=85d1db9fbef6b3e6148bbaf3235b01d446c6c07f

diff --git a/src/common/sessiond-comm/inet6.c b/src/common/sessiond-comm/inet6.c
index 03b6627d1..66a4b552f 100644
--- a/src/common/sessiond-comm/inet6.c
+++ b/src/common/sessiond-comm/inet6.c
@@ -99,14 +99,17 @@ LTTNG_HIDDEN
 int lttcomm_bind_inet6_sock(struct lttcomm_sock *sock)
 {
 	return bind(sock->fd,
-			(const struct sockaddr *) &sock->sockaddr.addr.sin6,
+			(const struct sockaddr *) ALIGNED_CONST_PTR(
+					sock->sockaddr.addr.sin6),
 			sizeof(sock->sockaddr.addr.sin6));
 }
 
 static
 int connect_no_timeout(struct lttcomm_sock *sock)
 {
-	return connect(sock->fd, (struct sockaddr *) &sock->sockaddr.addr.sin6,
+	return connect(sock->fd,
+			(const struct sockaddr *) ALIGNED_CONST_PTR(
+					sock->sockaddr.addr.sin6),
 			sizeof(sock->sockaddr.addr.sin6));
 }
 
@@ -139,11 +142,11 @@ int connect_with_timeout(struct lttcomm_sock *sock)
 	}
 
 	connect_ret = connect(sock->fd,
-		(struct sockaddr *) &sock->sockaddr.addr.sin6,
-		sizeof(sock->sockaddr.addr.sin6));
-	if (connect_ret == -1 && errno != EAGAIN
-			&& errno != EWOULDBLOCK
-			&& errno != EINPROGRESS) {
+			(const struct sockaddr *) ALIGNED_CONST_PTR(
+					sock->sockaddr.addr.sin6),
+			sizeof(sock->sockaddr.addr.sin6));
+	if (connect_ret == -1 && errno != EAGAIN && errno != EWOULDBLOCK &&
+			errno != EINPROGRESS) {
 		goto error;
 	} else if (!connect_ret) {
 		/* Connect succeeded */
@@ -259,6 +262,7 @@ struct lttcomm_sock *lttcomm_accept_inet6_sock(struct lttcomm_sock *sock)
 	int new_fd;
 	socklen_t len;
 	struct lttcomm_sock *new_sock;
+	struct sockaddr_in6 new_addr = {};
 
 	if (sock->proto == LTTCOMM_SOCK_UDP) {
 		/*
@@ -273,16 +277,15 @@ struct lttcomm_sock *lttcomm_accept_inet6_sock(struct lttcomm_sock *sock)
 		goto error;
 	}
 
-	len = sizeof(new_sock->sockaddr.addr.sin6);
+	len = sizeof(new_addr);
 
 	/* Blocking call */
-	new_fd = accept(sock->fd,
-			(struct sockaddr *) &new_sock->sockaddr.addr.sin6, &len);
+	new_fd = accept(sock->fd, (struct sockaddr *) &new_addr, &len);
 	if (new_fd < 0) {
 		PERROR("accept inet6");
 		goto error;
 	}
-
+	new_sock->sockaddr.addr.sin6 = new_addr;
 	new_sock->fd = new_fd;
 	new_sock->ops = &inet6_ops;
 
@@ -336,6 +339,7 @@ ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf,
 	struct iovec iov[1];
 	ssize_t ret = -1;
 	size_t len_last;
+	struct sockaddr_in6 addr = sock->sockaddr.addr.sin6;
 
 	memset(&msg, 0, sizeof(msg));
 
@@ -344,7 +348,7 @@ ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf,
 	msg.msg_iov = iov;
 	msg.msg_iovlen = 1;
 
-	msg.msg_name = (struct sockaddr *) &sock->sockaddr.addr.sin6;
+	msg.msg_name = (struct sockaddr *) &addr;
 	msg.msg_namelen = sizeof(sock->sockaddr.addr.sin6);
 
 	do {
@@ -391,9 +395,13 @@ ssize_t lttcomm_sendmsg_inet6_sock(struct lttcomm_sock *sock, const void *buf,
 
 	switch (sock->proto) {
 	case LTTCOMM_SOCK_UDP:
-		msg.msg_name = (struct sockaddr *) &sock->sockaddr.addr.sin6;
+	{
+		struct sockaddr_in6 addr = sock->sockaddr.addr.sin6;
+
+		msg.msg_name = (struct sockaddr *) &addr;
 		msg.msg_namelen = sizeof(sock->sockaddr.addr.sin6);
 		break;
+	}
 	default:
 		break;
 	}