X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Finet.c;h=ed7f5dc165e1b3961a2f53ef3107a0f54db85472;hb=f28f9e449e13d6a3495408e5329514fa5ca7150e;hp=5727c91199a2cfb3244041444d6cfa374052c276;hpb=890d8fe47755c3bad936389cf48ffa141cff41c9;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/inet.c b/src/common/sessiond-comm/inet.c
index 5727c9119..ed7f5dc16 100644
--- a/src/common/sessiond-comm/inet.c
+++ b/src/common/sessiond-comm/inet.c
@@ -26,15 +26,14 @@
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <time.h>
+#include <common/compat/time.h>
 #include <poll.h>
 
 #include <common/common.h>
+#include <common/time.h>
 
 #include "inet.h"
 
-#define MSEC_PER_SEC	1000
-#define NSEC_PER_MSEC	1000000
 #define RECONNECT_DELAY	200	/* ms */
 
 /*
@@ -103,7 +102,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");
@@ -159,7 +158,7 @@ int connect_with_timeout(struct lttcomm_sock *sock)
 		return -1;
 	}
 
-	ret = clock_gettime(CLOCK_MONOTONIC, &orig_time);
+	ret = lttng_clock_gettime(CLOCK_MONOTONIC, &orig_time);
 	if (ret == -1) {
 		PERROR("clock_gettime");
 		return -1;
@@ -177,6 +176,8 @@ int connect_with_timeout(struct lttcomm_sock *sock)
 		goto success;
 	}
 
+	DBG("Asynchronous connect for sock %d, performing polling with"
+			" timeout: %lums", sock->fd, timeout);
 	/*
 	 * Perform poll loop following EINPROGRESS recommendation from
 	 * connect(2) man page.
@@ -203,17 +204,20 @@ int connect_with_timeout(struct lttcomm_sock *sock)
 			ret = getsockopt(sock->fd, SOL_SOCKET,
 				SO_ERROR, &optval, &optval_len);
 			if (ret) {
+				PERROR("getsockopt");
 				goto error;
 			}
 			if (!optval) {
 				connect_ret = 0;
 				goto success;
 			} else {
+				/* Get actual connect() errno from opt_val */
+				errno = optval;
 				goto error;
 			}
 		}
 		/* ret == 0: timeout */
-		ret = clock_gettime(CLOCK_MONOTONIC, &cur_time);
+		ret = lttng_clock_gettime(CLOCK_MONOTONIC, &cur_time);
 		if (ret == -1) {
 			PERROR("clock_gettime");
 			connect_ret = ret;
@@ -407,7 +411,7 @@ ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
  * Return the size of sent data.
  */
 LTTNG_HIDDEN
-ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
+ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, const void *buf,
 		size_t len, int flags)
 {
 	struct msghdr msg;
@@ -416,7 +420,7 @@ ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
 
 	memset(&msg, 0, sizeof(msg));
 
-	iov[0].iov_base = buf;
+	iov[0].iov_base = (void *) buf;
 	iov[0].iov_len = len;
 	msg.msg_iov = iov;
 	msg.msg_iovlen = 1;