From 48ac959645b63d95e4cd6d3228448350513acab9 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Tue, 20 Feb 2018 22:06:31 -0500 Subject: [PATCH] Fix: set errno with value from SO_ERROR on error. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Debugging output at the same time in case of asynchronous handling. Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau --- src/common/sessiond-comm/inet.c | 5 +++++ src/common/sessiond-comm/inet6.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/src/common/sessiond-comm/inet.c b/src/common/sessiond-comm/inet.c index 25dbd2195..ed7f5dc16 100644 --- a/src/common/sessiond-comm/inet.c +++ b/src/common/sessiond-comm/inet.c @@ -176,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. @@ -202,12 +204,15 @@ 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; } } diff --git a/src/common/sessiond-comm/inet6.c b/src/common/sessiond-comm/inet6.c index 0b0383cdd..1fd18a962 100644 --- a/src/common/sessiond-comm/inet6.c +++ b/src/common/sessiond-comm/inet6.c @@ -174,6 +174,9 @@ 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. @@ -200,12 +203,15 @@ 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; } } -- 2.34.1