X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.c;h=ed185b1ea8934dd39af312258e9c858b984d8b85;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=9a13f41488a9ef6deb61323cf403f7ed8688da1a;hpb=618a6a28c0956fc6829c165a39ffec97f239096c;p=lttng-tools.git diff --git a/src/common/sessiond-comm/sessiond-comm.c b/src/common/sessiond-comm/sessiond-comm.c index 9a13f4148..ed185b1ea 100644 --- a/src/common/sessiond-comm/sessiond-comm.c +++ b/src/common/sessiond-comm/sessiond-comm.c @@ -1,23 +1,12 @@ /* - * Copyright (C) 2011 - David Goulet - * Mathieu Desnoyers + * Copyright (C) 2011 David Goulet + * Copyright (C) 2011 Mathieu Desnoyers + * + * SPDX-License-Identifier: GPL-2.0-only * - * 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. - * - * 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 -#include +#define _LGPL_SOURCE #include #include #include @@ -25,19 +14,22 @@ #include #include #include -#include +#include #include +#include #include "sessiond-comm.h" /* For Unix socket */ -#include "unix.h" +#include /* For Inet socket */ #include "inet.h" /* For Inet6 socket */ #include "inet6.h" +#define NETWORK_TIMEOUT_ENV "LTTNG_NETWORK_SOCKET_TIMEOUT" + static struct lttcomm_net_family net_families[] = { { LTTCOMM_INET, lttcomm_create_inet_sock }, { LTTCOMM_INET6, lttcomm_create_inet6_sock }, @@ -70,6 +62,8 @@ static const char *lttcomm_readable_code[] = { [ LTTCOMM_ERR_INDEX(LTTCOMM_NR) ] = "Unknown error code" }; +static unsigned long network_timeout; + /* * Return ptr to string representing a human readable error code from the * lttcomm_return_code enum. @@ -97,7 +91,7 @@ int lttcomm_create_sock(struct lttcomm_sock *sock) { int ret, _sock_type, _sock_proto, domain; - assert(sock); + LTTNG_ASSERT(sock); domain = sock->sockaddr.type; if (domain != LTTCOMM_INET && domain != LTTCOMM_INET6) { @@ -163,7 +157,7 @@ struct lttcomm_sock *lttcomm_alloc_copy_sock(struct lttcomm_sock *src) struct lttcomm_sock *sock; /* Safety net */ - assert(src); + LTTNG_ASSERT(src); sock = lttcomm_alloc_sock(src->proto); if (sock == NULL) { @@ -186,8 +180,8 @@ LTTNG_HIDDEN void lttcomm_copy_sock(struct lttcomm_sock *dst, struct lttcomm_sock *src) { /* Safety net */ - assert(dst); - assert(src); + LTTNG_ASSERT(dst); + LTTNG_ASSERT(src); dst->proto = src->proto; dst->fd = src->fd; @@ -205,9 +199,9 @@ int lttcomm_init_inet_sockaddr(struct lttcomm_sockaddr *sockaddr, { int ret; - assert(sockaddr); - assert(ip); - assert(port > 0 && port <= 65535); + LTTNG_ASSERT(sockaddr); + LTTNG_ASSERT(ip); + LTTNG_ASSERT(port > 0 && port <= 65535); memset(sockaddr, 0, sizeof(struct lttcomm_sockaddr)); @@ -236,9 +230,9 @@ int lttcomm_init_inet6_sockaddr(struct lttcomm_sockaddr *sockaddr, { int ret; - assert(sockaddr); - assert(ip); - assert(port > 0 && port <= 65535); + LTTNG_ASSERT(sockaddr); + LTTNG_ASSERT(ip); + LTTNG_ASSERT(port > 0 && port <= 65535); memset(sockaddr, 0, sizeof(struct lttcomm_sockaddr)); @@ -267,7 +261,7 @@ struct lttcomm_sock *lttcomm_alloc_sock_from_uri(struct lttng_uri *uri) struct lttcomm_sock *sock = NULL; /* Safety net */ - assert(uri); + LTTNG_ASSERT(uri); /* Check URI protocol */ if (uri->proto == LTTNG_TCP) { @@ -332,7 +326,7 @@ struct lttcomm_relayd_sock *lttcomm_alloc_relayd_sock(struct lttng_uri *uri, struct lttcomm_sock *tmp_sock = NULL; struct lttcomm_relayd_sock *rsock = NULL; - assert(uri); + LTTNG_ASSERT(uri); rsock = zmalloc(sizeof(*rsock)); if (!rsock) { @@ -368,3 +362,117 @@ error_free: error: return NULL; } + +/* + * Set socket receiving timeout. + */ +LTTNG_HIDDEN +int lttcomm_setsockopt_rcv_timeout(int sock, unsigned int msec) +{ + int ret; + struct timeval tv; + + tv.tv_sec = msec / 1000; + tv.tv_usec = (msec % 1000) * 1000; + + ret = setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)); + if (ret < 0) { + PERROR("setsockopt SO_RCVTIMEO"); + } + + return ret; +} + +/* + * Set socket sending timeout. + */ +LTTNG_HIDDEN +int lttcomm_setsockopt_snd_timeout(int sock, unsigned int msec) +{ + int ret; + struct timeval tv; + + tv.tv_sec = msec / 1000; + tv.tv_usec = (msec % 1000) * 1000; + + ret = setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)); + if (ret < 0) { + PERROR("setsockopt SO_SNDTIMEO"); + } + + return ret; +} + +LTTNG_HIDDEN +int lttcomm_sock_get_port(const struct lttcomm_sock *sock, uint16_t *port) +{ + LTTNG_ASSERT(sock); + LTTNG_ASSERT(port); + LTTNG_ASSERT(sock->sockaddr.type == LTTCOMM_INET || + sock->sockaddr.type == LTTCOMM_INET6); + LTTNG_ASSERT(sock->proto == LTTCOMM_SOCK_TCP || + sock->proto == LTTCOMM_SOCK_UDP); + + switch (sock->sockaddr.type) { + case LTTCOMM_INET: + *port = ntohs(sock->sockaddr.addr.sin.sin_port); + break; + case LTTCOMM_INET6: + *port = ntohs(sock->sockaddr.addr.sin6.sin6_port); + break; + default: + abort(); + } + + return 0; +} + +LTTNG_HIDDEN +int lttcomm_sock_set_port(struct lttcomm_sock *sock, uint16_t port) +{ + LTTNG_ASSERT(sock); + LTTNG_ASSERT(sock->sockaddr.type == LTTCOMM_INET || + sock->sockaddr.type == LTTCOMM_INET6); + LTTNG_ASSERT(sock->proto == LTTCOMM_SOCK_TCP || + sock->proto == LTTCOMM_SOCK_UDP); + + switch (sock->sockaddr.type) { + case LTTCOMM_INET: + sock->sockaddr.addr.sin.sin_port = htons(port); + break; + case LTTCOMM_INET6: + sock->sockaddr.addr.sin6.sin6_port = htons(port); + break; + default: + abort(); + } + + return 0; +} + +LTTNG_HIDDEN +void lttcomm_init(void) +{ + const char *env; + + env = getenv(NETWORK_TIMEOUT_ENV); + if (env) { + long timeout; + + errno = 0; + timeout = strtol(env, NULL, 0); + if (errno != 0 || timeout < -1L) { + PERROR("Network timeout"); + } else { + if (timeout > 0) { + network_timeout = timeout; + } + } + } +} + +LTTNG_HIDDEN +unsigned long lttcomm_get_network_timeout(void) +{ + return network_timeout; +}