X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.c;h=f3680c1391eb941b32b12726d8df82ba4540beb0;hb=f895927f329180ca1e6f4426e9d3c6250ae698ba;hp=336902a60f597d6c7820f34032f29d6a77b8396f;hpb=2038dd6ce78bc856ece474626b7f039d19860bce;p=lttng-tools.git diff --git a/src/common/sessiond-comm/sessiond-comm.c b/src/common/sessiond-comm/sessiond-comm.c index 336902a60..f3680c139 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 _LGPL_SOURCE -#include #include #include #include @@ -25,9 +14,10 @@ #include #include #include -#include +#include #include +#include #include "sessiond-comm.h" @@ -80,7 +70,6 @@ static unsigned long network_timeout; * * These code MUST be negative in other to treat that as an error value. */ -LTTNG_HIDDEN const char *lttcomm_get_readable_code(enum lttcomm_return_code code) { code = -code; @@ -96,12 +85,11 @@ const char *lttcomm_get_readable_code(enum lttcomm_return_code code) * Create socket from an already allocated lttcomm socket structure and init * sockaddr in the lttcomm sock. */ -LTTNG_HIDDEN 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) { @@ -136,7 +124,6 @@ error: /* * Return allocated lttcomm socket structure. */ -LTTNG_HIDDEN struct lttcomm_sock *lttcomm_alloc_sock(enum lttcomm_sock_proto proto) { struct lttcomm_sock *sock; @@ -161,13 +148,12 @@ end: * This is mostly useful when lttcomm_sock are passed between process where the * fd and ops have to be changed within the correct address space. */ -LTTNG_HIDDEN 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,12 +172,11 @@ alloc_error: * This is mostly useful when lttcomm_sock are passed between process where the * fd and ops have to be changed within the correct address space. */ -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; @@ -203,15 +188,14 @@ void lttcomm_copy_sock(struct lttcomm_sock *dst, struct lttcomm_sock *src) /* * Init IPv4 sockaddr structure. */ -LTTNG_HIDDEN int lttcomm_init_inet_sockaddr(struct lttcomm_sockaddr *sockaddr, const char *ip, unsigned int port) { 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)); @@ -234,15 +218,14 @@ error: /* * Init IPv6 sockaddr structure. */ -LTTNG_HIDDEN int lttcomm_init_inet6_sockaddr(struct lttcomm_sockaddr *sockaddr, const char *ip, unsigned int port) { 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)); @@ -263,7 +246,6 @@ error: /* * Return allocated lttcomm socket structure from lttng URI. */ -LTTNG_HIDDEN struct lttcomm_sock *lttcomm_alloc_sock_from_uri(struct lttng_uri *uri) { int ret; @@ -271,7 +253,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) { @@ -316,7 +298,6 @@ alloc_error: /* * Destroy and free lttcomm socket. */ -LTTNG_HIDDEN void lttcomm_destroy_sock(struct lttcomm_sock *sock) { free(sock); @@ -328,7 +309,6 @@ void lttcomm_destroy_sock(struct lttcomm_sock *sock) * * On error, NULL is returned. */ -LTTNG_HIDDEN struct lttcomm_relayd_sock *lttcomm_alloc_relayd_sock(struct lttng_uri *uri, uint32_t major, uint32_t minor) { @@ -336,7 +316,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) { @@ -376,7 +356,6 @@ error: /* * Set socket receiving timeout. */ -LTTNG_HIDDEN int lttcomm_setsockopt_rcv_timeout(int sock, unsigned int msec) { int ret; @@ -396,7 +375,6 @@ int lttcomm_setsockopt_rcv_timeout(int sock, unsigned int msec) /* * Set socket sending timeout. */ -LTTNG_HIDDEN int lttcomm_setsockopt_snd_timeout(int sock, unsigned int msec) { int ret; @@ -413,7 +391,51 @@ int lttcomm_setsockopt_snd_timeout(int sock, unsigned int msec) 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; +} + +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; +} + void lttcomm_init(void) { const char *env; @@ -434,7 +456,6 @@ void lttcomm_init(void) } } -LTTNG_HIDDEN unsigned long lttcomm_get_network_timeout(void) { return network_timeout;