X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Finet.c;h=7aee725602f1441f72093cc42ffdac7e16257117;hb=6b5133f20604535057af49574f4f506c8d94846c;hp=51ac670f27256a1e7390661900aaf668543d3220;hpb=6364a07adde1072d595044a19359e61fc27940dd;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/inet.c b/src/common/sessiond-comm/inet.c
index 51ac670f2..7aee72560 100644
--- a/src/common/sessiond-comm/inet.c
+++ b/src/common/sessiond-comm/inet.c
@@ -47,9 +47,10 @@ static const struct lttcomm_proto_ops inet_ops = {
 /*
  * Creates an PF_INET socket.
  */
+__attribute__((visibility("hidden")))
 int lttcomm_create_inet_sock(struct lttcomm_sock *sock, int type, int proto)
 {
-	int val, ret;
+	int val = 1, ret;
 
 	/* Create server socket */
 	if ((sock->fd = socket(PF_INET, type, proto)) < 0) {
@@ -77,6 +78,7 @@ error:
 /*
  * Bind socket and return.
  */
+__attribute__((visibility("hidden")))
 int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
 {
 	int ret;
@@ -93,6 +95,7 @@ int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
 /*
  * Connect PF_INET socket.
  */
+__attribute__((visibility("hidden")))
 int lttcomm_connect_inet_sock(struct lttcomm_sock *sock)
 {
 	int ret, closeret;
@@ -122,10 +125,11 @@ error_connect:
  * Do an accept(2) on the sock and return the new lttcomm socket. The socket
  * MUST be bind(2) before.
  */
+__attribute__((visibility("hidden")))
 struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
 {
 	int new_fd;
-	socklen_t len = 0;
+	socklen_t len;
 	struct lttcomm_sock *new_sock;
 
 	if (sock->proto == LTTCOMM_SOCK_UDP) {
@@ -136,11 +140,13 @@ struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
 		goto end;
 	}
 
-	new_sock = lttcomm_alloc_sock(LTTCOMM_INET, sock->proto);
+	new_sock = lttcomm_alloc_sock(sock->proto);
 	if (new_sock == NULL) {
 		goto error;
 	}
 
+	len = sizeof(new_sock->sockaddr.addr.sin);
+
 	/* Blocking call */
 	new_fd = accept(sock->fd, (struct sockaddr *) &new_sock->sockaddr.addr.sin,
 			&len);
@@ -150,6 +156,7 @@ struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
 	}
 
 	new_sock->fd = new_fd;
+	new_sock->ops = &inet_ops;
 
 end:
 	return new_sock;
@@ -162,6 +169,7 @@ error:
 /*
  * Make the socket listen using LTTNG_SESSIOND_COMM_MAX_LISTEN.
  */
+__attribute__((visibility("hidden")))
 int lttcomm_listen_inet_sock(struct lttcomm_sock *sock, int backlog)
 {
 	int ret;
@@ -192,12 +200,14 @@ end:
  *
  * Return the size of received data.
  */
+__attribute__((visibility("hidden")))
 ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
 		size_t len, int flags)
 {
 	struct msghdr msg;
 	struct iovec iov[1];
 	ssize_t ret = -1;
+	size_t len_last;
 
 	memset(&msg, 0, sizeof(msg));
 
@@ -209,16 +219,21 @@ ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
 	msg.msg_name = (struct sockaddr *) &sock->sockaddr.addr.sin;
 	msg.msg_namelen = sizeof(sock->sockaddr.addr.sin);
 
-	if (flags == 0) {
-		flags = MSG_WAITALL;
-	}
-
 	do {
+		len_last = iov[0].iov_len;
 		ret = recvmsg(sock->fd, &msg, flags);
-	} while (ret < 0 && errno == EINTR);
+		if (ret > 0) {
+			iov[0].iov_base += ret;
+			iov[0].iov_len -= ret;
+			assert(ret <= len_last);
+		}
+	} while ((ret > 0 && ret < len_last) || (ret < 0 && errno == EINTR));
 	if (ret < 0) {
 		PERROR("recvmsg inet");
+	} else if (ret > 0) {
+		ret = len;
 	}
+	/* Else ret = 0 meaning an orderly shutdown. */
 
 	return ret;
 }
@@ -228,6 +243,7 @@ ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
  *
  * Return the size of sent data.
  */
+__attribute__((visibility("hidden")))
 ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
 		size_t len, int flags)
 {
@@ -270,17 +286,18 @@ ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
 /*
  * Shutdown cleanly and close.
  */
+__attribute__((visibility("hidden")))
 int lttcomm_close_inet_sock(struct lttcomm_sock *sock)
 {
-	int ret, closeret;
+	int ret;
 
-	/* Don't try to close an invalid mark socket */
+	/* Don't try to close an invalid marked socket */
 	if (sock->fd == -1) {
 		return 0;
 	}
 
-	closeret = close(sock->fd);
-	if (closeret) {
+	ret = close(sock->fd);
+	if (ret) {
 		PERROR("close inet");
 	}