X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Furi.c;h=0638aebd90026ea9b7378106927ec5d9796af704;hp=4af94072cb6100ab99e70228087022a20840e560;hb=959e3c66727698e58a8788aceeda5820b3c938ba;hpb=07b86b528dc279d59cdf16e6cb946c144fe773f2 diff --git a/src/common/uri.c b/src/common/uri.c index 4af94072c..0638aebd9 100644 --- a/src/common/uri.c +++ b/src/common/uri.c @@ -1,24 +1,14 @@ /* - * 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 +#include #include #include #include @@ -29,6 +19,9 @@ #include "uri.h" +#define LOOPBACK_ADDR_IPV4 "127.0.0.1" +#define LOOPBACK_ADDR_IPV6 "::1" + enum uri_proto_code { P_NET, P_NET6, P_FILE, P_TCP, P_TCP6, }; @@ -45,8 +38,10 @@ struct uri_proto { static const struct uri_proto proto_uri[] = { { .name = "file", .leading_string = "file://", .code = P_FILE, .type = 0, .dtype = LTTNG_DST_PATH }, { .name = "net", .leading_string = "net://", .code = P_NET, .type = LTTNG_TCP, .dtype = LTTNG_DST_IPV4 }, + { .name = "net4", .leading_string = "net4://", .code = P_NET, .type = LTTNG_TCP, .dtype = LTTNG_DST_IPV4 }, { .name = "net6", .leading_string = "net6://", .code = P_NET6, .type = LTTNG_TCP, .dtype = LTTNG_DST_IPV6 }, { .name = "tcp", .leading_string = "tcp://", .code = P_TCP, .type = LTTNG_TCP, .dtype = LTTNG_DST_IPV4 }, + { .name = "tcp4", .leading_string = "tcp4://", .code = P_TCP, .type = LTTNG_TCP, .dtype = LTTNG_DST_IPV4 }, { .name = "tcp6", .leading_string = "tcp6://", .code = P_TCP6, .type = LTTNG_TCP, .dtype = LTTNG_DST_IPV6 }, /* Invalid proto marking the end of the array. */ { NULL, NULL, 0, 0, 0 } @@ -56,7 +51,7 @@ static const struct uri_proto proto_uri[] = { * Return pointer to the character in s matching one of the characters in * accept. If nothing is found, return pointer to the end of string (eos). */ -static const inline char *strpbrk_or_eos(const char *s, const char *accept) +static inline const char *strpbrk_or_eos(const char *s, const char *accept) { char *p = strpbrk(s, accept); if (p == NULL) { @@ -66,7 +61,6 @@ static const inline char *strpbrk_or_eos(const char *s, const char *accept) return p; } - /* * Validate if proto is a supported protocol from proto_uri array. */ @@ -113,15 +107,44 @@ static int set_ip_address(const char *addr, int af, char *dst, size_t size) ret = inet_pton(af, addr, buf); if (ret < 1) { /* We consider the dst to be an hostname or an invalid IP char */ - record = gethostbyname2(addr, af); - if (record == NULL) { + record = lttng_gethostbyname2(addr, af); + if (record) { + /* Translate IP to string */ + if (!inet_ntop(af, record->h_addr_list[0], dst, size)) { + PERROR("inet_ntop"); + goto error; + } + } else if (!strcmp(addr, "localhost") && + (af == AF_INET || af == AF_INET6)) { + /* + * Some systems may not have "localhost" defined in + * accordance with IETF RFC 6761. According to this RFC, + * applications may recognize "localhost" names as + * special and resolve to the appropriate loopback + * address. + * + * We choose to use the system name resolution API first + * to honor its network configuration. If this fails, we + * resolve to the appropriate loopback address. This is + * done to accommodates systems which may want to start + * tracing before their network configured. + */ + const char *loopback_addr = af == AF_INET ? + LOOPBACK_ADDR_IPV4 : LOOPBACK_ADDR_IPV6; + const size_t loopback_addr_len = af == AF_INET ? + sizeof(LOOPBACK_ADDR_IPV4) : + sizeof(LOOPBACK_ADDR_IPV6); + + DBG2("Could not resolve localhost address, using fallback"); + if (loopback_addr_len > size) { + ERR("Could not resolve localhost address; destination string is too short"); + goto error; + } + strcpy(dst, loopback_addr); + } else { /* At this point, the IP or the hostname is bad */ - ERR("URI parse bad hostname %s for af %d", addr, af); goto error; } - - /* Translate IP to string */ - (void) inet_ntop(af, record->h_addr_list[0], dst, size); } else { if (size > 0) { strncpy(dst, addr, size); @@ -130,10 +153,10 @@ static int set_ip_address(const char *addr, int af, char *dst, size_t size) } DBG2("IP address resolved to %s", dst); - return 0; error: + ERR("URI parse bad hostname %s for af %d", addr, af); return -1; } @@ -194,13 +217,13 @@ int uri_to_str_url(struct lttng_uri *uri, char *dst, size_t size) if (uri->dtype == LTTNG_DST_PATH) { ipver = 0; addr = uri->dst.path; - (void) snprintf(proto, sizeof(proto) + 1, "file"); - (void) snprintf(port, sizeof(port) + 1, "%s", ""); + (void) snprintf(proto, sizeof(proto), "file"); + (void) snprintf(port, sizeof(port), "%s", ""); } else { ipver = (uri->dtype == LTTNG_DST_IPV4) ? 4 : 6; addr = (ipver == 4) ? uri->dst.ipv4 : uri->dst.ipv6; - (void) snprintf(proto, sizeof(proto) + 1, "net%d", ipver); - (void) snprintf(port, sizeof(port) + 1, ":%d", uri->port); + (void) snprintf(proto, sizeof(proto), "tcp%d", ipver); + (void) snprintf(port, sizeof(port), ":%d", uri->port); } ret = snprintf(dst, size, "%s://%s%s%s%s/%s", proto, @@ -233,22 +256,6 @@ void uri_free(struct lttng_uri *uri) free(uri); } -/* - * Return an allocated URI. - */ -LTTNG_HIDDEN -struct lttng_uri *uri_create(void) -{ - struct lttng_uri *uri; - - uri = zmalloc(sizeof(struct lttng_uri)); - if (uri == NULL) { - PERROR("zmalloc uri"); - } - - return uri; -} - /* * Parses a string URI to a lttng_uri. This function can potentially return * more than one URI in uris so the size of the array is returned and uris is @@ -554,6 +561,10 @@ ssize_t uri_parse_str_urls(const char *ctrl_url, const char *data_url, if (ret < 0) { PERROR("snprintf file url"); goto parse_error; + } else if (ret >= sizeof(url)) { + PERROR("snprintf file url is too long"); + goto parse_error; + } ctrl_url = url; } @@ -571,7 +582,7 @@ ssize_t uri_parse_str_urls(const char *ctrl_url, const char *data_url, if (ctrl_uris[0].dtype == LTTNG_DST_PATH && (data_url && *data_url != '\0')) { - ERR("Can not have a data URL when destination is file://"); + ERR("Cannot have a data URL when destination is file://"); goto error; } @@ -607,10 +618,12 @@ ssize_t uri_parse_str_urls(const char *ctrl_url, const char *data_url, set_default_uri_attr(&data_uris[0], LTTNG_STREAM_DATA); - ret = compare_destination(&ctrl_uris[0], &data_uris[0]); - if (ret != 0) { - ERR("Control and data destination mismatch"); - goto error; + if (ctrl_uris) { + ret = compare_destination(&ctrl_uris[0], &data_uris[0]); + if (ret != 0) { + ERR("Control and data destination mismatch"); + goto error; + } } }