Fix: unprivilieged sessiond agent port clashes with root sessiond

[lttng-tools.git] / src / common / sessiond-comm / inet6.c

diff --git a/src/common/sessiond-comm/inet6.c b/src/common/sessiond-comm/inet6.c
index 1413c35172a32bfda2293bbe8aae6fd8acba6c1a..e71b55ad1c3651defdbd6ef1df187309ce8825ff 100644 (file)
--- a/src/common/sessiond-comm/inet6.c
+++ b/src/common/sessiond-comm/inet6.c
@@ -30,11 +30,10 @@
 #include <poll.h>
 
 #include <common/common.h>
+#include <common/time.h>
 
 #include "inet6.h"
 
-#define MSEC_PER_SEC   1000
-#define NSEC_PER_MSEC  1000000
 #define RECONNECT_DELAY        200     /* ms */
 
 /*
@@ -99,15 +98,9 @@ error:
 LTTNG_HIDDEN
 int lttcomm_bind_inet6_sock(struct lttcomm_sock *sock)
 {
-       int ret;
-
-       ret = bind(sock->fd, (const struct sockaddr *) &sock->sockaddr.addr.sin6,
+       return bind(sock->fd,
+                       (const struct sockaddr *) &sock->sockaddr.addr.sin6,
                        sizeof(sock->sockaddr.addr.sin6));
-       if (ret < 0) {
-               PERROR("bind inet6");
-       }
-
-       return ret;
 }
 
 static
@@ -175,6 +168,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.
@@ -201,12 +197,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;
                        }
                }