X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Finet.c;h=22d9181eeeb1f4f562e64a314320c6a3f14133ed;hb=e909777bf000d0fd8f0116569b3fb31676b228be;hp=6b7a894ad5e5758b2dc4b89a05a79c58f9270a6e;hpb=18a9df278ae11194786b85de5e3135a357e4959e;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/inet.c b/src/common/sessiond-comm/inet.c
index 6b7a894ad..22d9181ee 100644
--- a/src/common/sessiond-comm/inet.c
+++ b/src/common/sessiond-comm/inet.c
@@ -102,7 +102,8 @@ int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
 {
 	int ret;
 
-	ret = bind(sock->fd, (const struct sockaddr *) &sock->sockaddr.addr.sin,
+	ret = bind(sock->fd, (const struct sockaddr *) ALIGNED_CONST_PTR(
+			sock->sockaddr.addr.sin),
 			sizeof(sock->sockaddr.addr.sin));
 	if (ret < 0) {
 		PERROR("bind inet");
@@ -114,7 +115,9 @@ int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
 static
 int connect_no_timeout(struct lttcomm_sock *sock)
 {
-	return connect(sock->fd, (struct sockaddr *) &sock->sockaddr.addr.sin,
+	return connect(sock->fd,
+			(const struct sockaddr *) ALIGNED_CONST_PTR(
+					sock->sockaddr.addr.sin),
 			sizeof(sock->sockaddr.addr.sin));
 }
 
@@ -147,11 +150,11 @@ int connect_with_timeout(struct lttcomm_sock *sock)
 	}
 
 	connect_ret = connect(sock->fd,
-		(struct sockaddr *) &sock->sockaddr.addr.sin,
-		sizeof(sock->sockaddr.addr.sin));
-	if (connect_ret == -1 && errno != EAGAIN
-			&& errno != EWOULDBLOCK
-			&& errno != EINPROGRESS) {
+			(const struct sockaddr *) ALIGNED_CONST_PTR(
+					sock->sockaddr.addr.sin),
+			sizeof(sock->sockaddr.addr.sin));
+	if (connect_ret == -1 && errno != EAGAIN && errno != EWOULDBLOCK &&
+			errno != EINPROGRESS) {
 		goto error;
 	} else if (!connect_ret) {
 		/* Connect succeeded */
@@ -267,6 +270,7 @@ struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
 	socklen_t len;
 	struct lttcomm_sock *new_sock;
 	unsigned long timeout;
+	struct sockaddr_in new_addr = {};
 
 	if (sock->proto == LTTCOMM_SOCK_UDP) {
 		/*
@@ -281,15 +285,15 @@ struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
 		goto error;
 	}
 
-	len = sizeof(new_sock->sockaddr.addr.sin);
+	len = sizeof(new_addr);
 
 	/* Blocking call */
-	new_fd = accept(sock->fd, (struct sockaddr *) &new_sock->sockaddr.addr.sin,
-			&len);
+	new_fd = accept(sock->fd, (struct sockaddr *) &new_addr, &len);
 	if (new_fd < 0) {
 		PERROR("accept inet");
 		goto error;
 	}
+	new_sock->sockaddr.addr.sin = new_addr;
 	timeout = lttcomm_get_network_timeout();
 	if (timeout) {
 		int ret;
@@ -362,6 +366,7 @@ ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
 	struct iovec iov[1];
 	ssize_t ret = -1;
 	size_t len_last;
+	struct sockaddr_in addr = sock->sockaddr.addr.sin;
 
 	memset(&msg, 0, sizeof(msg));
 
@@ -370,7 +375,7 @@ ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
 	msg.msg_iov = iov;
 	msg.msg_iovlen = 1;
 
-	msg.msg_name = (struct sockaddr *) &sock->sockaddr.addr.sin;
+	msg.msg_name = (struct sockaddr *) &addr;
 	msg.msg_namelen = sizeof(sock->sockaddr.addr.sin);
 
 	do {
@@ -414,9 +419,13 @@ ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, const void *buf,
 
 	switch (sock->proto) {
 	case LTTCOMM_SOCK_UDP:
-		msg.msg_name = (struct sockaddr *) &sock->sockaddr.addr.sin;
+	{
+		struct sockaddr_in addr = sock->sockaddr.addr.sin;
+
+		msg.msg_name = (struct sockaddr *) &addr;
 		msg.msg_namelen = sizeof(sock->sockaddr.addr.sin);
 		break;
+	}
 	default:
 		break;
 	}