Fix: free metadata cache after grace period in consumer

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

diff --git a/src/common/uri.c b/src/common/uri.c
index 8d7cf9074beb02ab5f9981edd1f790dfd042070d..668e617d8b3fda5ea10b70e71878cd7d8ad4af99 100644 (file)
--- a/src/common/uri.c
+++ b/src/common/uri.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <arpa/inet.h>
 #include <netdb.h>
@@ -45,8 +46,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 }
@@ -186,7 +189,7 @@ 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];
+       char proto[5], port[7];
 
        assert(uri);
        assert(dst);
@@ -199,7 +202,7 @@ int uri_to_str_url(struct lttng_uri *uri, char *dst, size_t size)
        } 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(proto, sizeof(proto), "tcp%d", ipver);
                (void) snprintf(port, sizeof(port), ":%d", uri->port);
        }