*/
#define _GNU_SOURCE
+#include <assert.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <stdlib.h>
* 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).
*/
-const inline char *strpbrk_or_eos(const char *s, const char *accept)
+static const inline char *strpbrk_or_eos(const char *s, const char *accept)
{
char *p = strpbrk(s, accept);
if (p == NULL) {
unsigned char buf[sizeof(struct in6_addr)];
struct hostent *record;
+ assert(addr);
+ assert(dst);
+
+ memset(dst, 0, size);
+
/* Network protocol */
ret = inet_pton(af, addr, buf);
if (ret < 1) {
/* Translate IP to string */
(void) inet_ntop(af, record->h_addr_list[0], dst, size);
} else {
- memcpy(dst, addr, size);
+ if (size > 0) {
+ strncpy(dst, addr, size);
+ dst[size - 1] = '\0';
+ }
}
DBG2("IP address resolved to %s", dst);
return -1;
}
+/*
+ * Build a string URL from a lttng_uri object.
+ */
+__attribute__((visibility("hidden")))
+int uri_to_str_url(struct lttng_uri *uri, char *dst, size_t size)
+{
+ int ipver, ret;
+ const char *addr;
+ char proto[4], port[7];
+
+ assert(uri);
+ assert(dst);
+
+ if (uri->dtype == LTTNG_DST_PATH) {
+ ipver = 0;
+ addr = uri->dst.path;
+ (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), "net%d", ipver);
+ (void) snprintf(port, sizeof(port), ":%d", uri->port);
+ }
+
+ ret = snprintf(dst, size, "%s://%s%s%s%s/%s", proto,
+ (ipver == 6) ? "[" : "", addr, (ipver == 6) ? "]" : "",
+ port, uri->subdir);
+ if (ret < 0) {
+ PERROR("snprintf uri to url");
+ }
+
+ return ret;
+}
+
/*
* Compare two URIs.
*
* Return 0 if equal else 1.
*/
+__attribute__((visibility("hidden")))
int uri_compare(struct lttng_uri *uri1, struct lttng_uri *uri2)
{
return memcmp(uri1, uri2, sizeof(struct lttng_uri));
/*
* Free URI memory.
*/
+__attribute__((visibility("hidden")))
void uri_free(struct lttng_uri *uri)
{
/* Safety check */
/*
* Return an allocated URI.
*/
+__attribute__((visibility("hidden")))
struct lttng_uri *uri_create(void)
{
struct lttng_uri *uri;
* This code was originally licensed GPLv2 so we acknolwedge the Free Software
* Foundation here for the work and to make sure we are compliant with it.
*/
+__attribute__((visibility("hidden")))
ssize_t uri_parse(const char *str_uri, struct lttng_uri **uris)
{
int ret, i = 0;