X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Finet6.c;h=40610ed5745bf54ddf7927c3fe98b3b5acec98fa;hp=ddbb50ed43aa96dc94b6f2fe4b8201c4925b8c5c;hb=edf4b93e2f5c849cbec49e987990b3705ea49f6a;hpb=7c5aef6226a4752f3a4e60cd0b52c741dced395e diff --git a/src/common/sessiond-comm/inet6.c b/src/common/sessiond-comm/inet6.c index ddbb50ed4..40610ed57 100644 --- a/src/common/sessiond-comm/inet6.c +++ b/src/common/sessiond-comm/inet6.c @@ -1,21 +1,11 @@ /* - * Copyright (C) 2012 - David Goulet + * Copyright (C) 2012 David Goulet * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License, version 2 only, as - * published by the Free Software Foundation. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE +#define _LGPL_SOURCE #include #include #include @@ -24,13 +14,18 @@ #include #include #include -#include +#include +#include +#include -#include -#include +#include +#include +#include #include "inet6.h" +#define RECONNECT_DELAY 200 /* ms */ + /* * INET protocol operations. */ @@ -47,10 +42,11 @@ static const struct lttcomm_proto_ops inet6_ops = { /* * Creates an PF_INET socket. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_create_inet6_sock(struct lttcomm_sock *sock, int type, int proto) { int val = 1, ret; + unsigned long timeout; /* Create server socket */ if ((sock->fd = socket(PF_INET6, type, proto)) < 0) { @@ -68,6 +64,17 @@ int lttcomm_create_inet6_sock(struct lttcomm_sock *sock, int type, int proto) PERROR("setsockopt inet6"); goto error; } + timeout = lttcomm_get_network_timeout(); + if (timeout) { + ret = lttcomm_setsockopt_rcv_timeout(sock->fd, timeout); + if (ret) { + goto error; + } + ret = lttcomm_setsockopt_snd_timeout(sock->fd, timeout); + if (ret) { + goto error; + } + } return 0; @@ -78,35 +85,149 @@ error: /* * Bind socket and return. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_bind_inet6_sock(struct lttcomm_sock *sock) { - int ret; + return bind(sock->fd, + (const struct sockaddr *) ALIGNED_CONST_PTR( + sock->sockaddr.addr.sin6), + sizeof(sock->sockaddr.addr.sin6)); +} - ret = bind(sock->fd, &sock->sockaddr.addr.sin6, +static +int connect_no_timeout(struct lttcomm_sock *sock) +{ + return connect(sock->fd, + (const struct sockaddr *) ALIGNED_CONST_PTR( + sock->sockaddr.addr.sin6), sizeof(sock->sockaddr.addr.sin6)); - if (ret < 0) { - PERROR("bind inet6"); +} + +static +int connect_with_timeout(struct lttcomm_sock *sock) +{ + unsigned long timeout = lttcomm_get_network_timeout(); + int ret, flags, connect_ret; + struct timespec orig_time, cur_time; + unsigned long diff_ms; + + ret = fcntl(sock->fd, F_GETFL, 0); + if (ret == -1) { + PERROR("fcntl"); + return -1; } + flags = ret; - return ret; + /* Set socket to nonblock */ + ret = fcntl(sock->fd, F_SETFL, flags | O_NONBLOCK); + if (ret == -1) { + PERROR("fcntl"); + return -1; + } + + ret = lttng_clock_gettime(CLOCK_MONOTONIC, &orig_time); + if (ret == -1) { + PERROR("clock_gettime"); + return -1; + } + + connect_ret = connect(sock->fd, + (const struct sockaddr *) ALIGNED_CONST_PTR( + sock->sockaddr.addr.sin6), + sizeof(sock->sockaddr.addr.sin6)); + if (connect_ret == -1 && errno != EAGAIN && errno != EWOULDBLOCK && + errno != EINPROGRESS) { + goto error; + } else if (!connect_ret) { + /* Connect succeeded */ + 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. + */ + do { + struct pollfd fds; + + fds.fd = sock->fd; + fds.events = POLLOUT; + fds.revents = 0; + ret = poll(&fds, 1, RECONNECT_DELAY); + if (ret < 0) { + goto error; + } else if (ret > 0) { + int optval; + socklen_t optval_len = sizeof(optval); + + if (!(fds.revents & POLLOUT)) { + /* Either hup or error */ + errno = EPIPE; + goto error; + } + /* got something */ + 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 = lttng_clock_gettime(CLOCK_MONOTONIC, &cur_time); + if (ret == -1) { + PERROR("clock_gettime"); + connect_ret = ret; + goto error; + } + if (timespec_to_ms(timespec_abs_diff(cur_time, orig_time), &diff_ms) < 0) { + ERR("timespec_to_ms input overflows milliseconds output"); + connect_ret = -1; + goto error; + } + } while (diff_ms < timeout); + + /* Timeout */ + errno = ETIMEDOUT; + connect_ret = -1; + +success: + /* Restore initial flags */ + ret = fcntl(sock->fd, F_SETFL, flags); + if (ret == -1) { + PERROR("fcntl"); + /* Continue anyway */ + } +error: + return connect_ret; } /* * Connect PF_INET socket. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_connect_inet6_sock(struct lttcomm_sock *sock) { int ret, closeret; - ret = connect(sock->fd, (struct sockaddr *) &sock->sockaddr.addr.sin6, - sizeof(sock->sockaddr.addr.sin6)); + if (lttcomm_get_network_timeout()) { + ret = connect_with_timeout(sock); + } else { + ret = connect_no_timeout(sock); + } if (ret < 0) { - /* - * Don't print message on connect error, because connect is used in - * normal execution to detect if sessiond is alive. - */ + PERROR("connect inet6"); goto error_connect; } @@ -125,12 +246,13 @@ 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"))) +LTTNG_HIDDEN struct lttcomm_sock *lttcomm_accept_inet6_sock(struct lttcomm_sock *sock) { int new_fd; socklen_t len; struct lttcomm_sock *new_sock; + struct sockaddr_in6 new_addr = {}; if (sock->proto == LTTCOMM_SOCK_UDP) { /* @@ -145,16 +267,15 @@ struct lttcomm_sock *lttcomm_accept_inet6_sock(struct lttcomm_sock *sock) goto error; } - len = sizeof(new_sock->sockaddr.addr.sin6); + len = sizeof(new_addr); /* Blocking call */ - new_fd = accept(sock->fd, - (struct sockaddr *) &new_sock->sockaddr.addr.sin6, &len); + new_fd = accept(sock->fd, (struct sockaddr *) &new_addr, &len); if (new_fd < 0) { PERROR("accept inet6"); goto error; } - + new_sock->sockaddr.addr.sin6 = new_addr; new_sock->fd = new_fd; new_sock->ops = &inet6_ops; @@ -169,7 +290,7 @@ error: /* * Make the socket listen using LTTNG_SESSIOND_COMM_MAX_LISTEN. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_listen_inet6_sock(struct lttcomm_sock *sock, int backlog) { int ret; @@ -200,7 +321,7 @@ end: * * Return the size of received data. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf, size_t len, int flags) { @@ -208,6 +329,7 @@ ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf, struct iovec iov[1]; ssize_t ret = -1; size_t len_last; + struct sockaddr_in6 addr = sock->sockaddr.addr.sin6; memset(&msg, 0, sizeof(msg)); @@ -216,13 +338,16 @@ ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf, msg.msg_iov = iov; msg.msg_iovlen = 1; - msg.msg_name = (struct sockaddr *) &sock->sockaddr.addr.sin6; + msg.msg_name = (struct sockaddr *) &addr; msg.msg_namelen = sizeof(sock->sockaddr.addr.sin6); do { len_last = iov[0].iov_len; ret = recvmsg(sock->fd, &msg, flags); if (ret > 0) { + if (flags & MSG_DONTWAIT) { + goto end; + } iov[0].iov_base += ret; iov[0].iov_len -= ret; assert(ret <= len_last); @@ -234,7 +359,7 @@ ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf, ret = len; } /* Else ret = 0 meaning an orderly shutdown. */ - +end: return ret; } @@ -243,8 +368,8 @@ ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf, * * Return the size of sent data. */ -__attribute__((visibility("hidden"))) -ssize_t lttcomm_sendmsg_inet6_sock(struct lttcomm_sock *sock, void *buf, +LTTNG_HIDDEN +ssize_t lttcomm_sendmsg_inet6_sock(struct lttcomm_sock *sock, const void *buf, size_t len, int flags) { struct msghdr msg; @@ -253,16 +378,20 @@ ssize_t lttcomm_sendmsg_inet6_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; switch (sock->proto) { case LTTCOMM_SOCK_UDP: - msg.msg_name = (struct sockaddr *) &sock->sockaddr.addr.sin6; + { + struct sockaddr_in6 addr = sock->sockaddr.addr.sin6; + + msg.msg_name = (struct sockaddr *) &addr; msg.msg_namelen = sizeof(sock->sockaddr.addr.sin6); break; + } default: break; } @@ -286,7 +415,7 @@ ssize_t lttcomm_sendmsg_inet6_sock(struct lttcomm_sock *sock, void *buf, /* * Shutdown cleanly and close. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_close_inet6_sock(struct lttcomm_sock *sock) { int ret;