Fix: increment channel refcount on add_stream

[lttng-tools.git] / src / common / uri.c

diff --git a/src/common/uri.c b/src/common/uri.c
index 3581e307d33a0dfa5bdcb5932b0e5fb648b30114..740a6d5c50fc6d7fad8e027bb024d9ff9527f8c5 100644 (file)
--- a/src/common/uri.c
+++ b/src/common/uri.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#include <assert.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <stdlib.h>
@@ -55,7 +56,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).
  */
-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) {
@@ -103,6 +104,11 @@ static int set_ip_address(const char *addr, int af, char *dst, size_t size)
        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) {
@@ -117,7 +123,10 @@ static int set_ip_address(const char *addr, int af, char *dst, size_t size)
                /* 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);
@@ -128,11 +137,47 @@ error:
        return -1;
 }
 
+/*
+ * Build a string URL from a lttng_uri object.
+ */
+LTTNG_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.
  */
+LTTNG_HIDDEN
 int uri_compare(struct lttng_uri *uri1, struct lttng_uri *uri2)
 {
        return memcmp(uri1, uri2, sizeof(struct lttng_uri));
@@ -141,17 +186,16 @@ int uri_compare(struct lttng_uri *uri1, struct lttng_uri *uri2)
 /*
  * Free URI memory.
  */
+LTTNG_HIDDEN
 void uri_free(struct lttng_uri *uri)
 {
-       /* Safety check */
-       if (uri != NULL) {
-               free(uri);
-       }
+       free(uri);
 }
 
 /*
  * Return an allocated URI.
  */
+LTTNG_HIDDEN
 struct lttng_uri *uri_create(void)
 {
        struct lttng_uri *uri;
@@ -180,6 +224,7 @@ struct lttng_uri *uri_create(void)
  * 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.
  */
+LTTNG_HIDDEN
 ssize_t uri_parse(const char *str_uri, struct lttng_uri **uris)
 {
        int ret, i = 0;
@@ -294,7 +339,6 @@ ssize_t uri_parse(const char *str_uri, struct lttng_uri **uris)
         * so we can define the control and data port.
         */
        while (*purl == ':') {
-               int port;
                const char *port_b, *port_e;
                char *port_f;
 
@@ -321,6 +365,8 @@ ssize_t uri_parse(const char *str_uri, struct lttng_uri **uris)
                port_e = purl;
 
                if (port_b != port_e) {
+                       int port;
+
                        port_f = utils_strdupdelim(port_b, port_e);
                        if (port_f == NULL) {
                                goto free_error;