X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Furi.c;h=668e617d8b3fda5ea10b70e71878cd7d8ad4af99;hb=49e614cb2878f0664c9f44f9f24cb1d81116de21;hp=4af94072cb6100ab99e70228087022a20840e560;hpb=07b86b528dc279d59cdf16e6cb946c144fe773f2;p=lttng-tools.git

diff --git a/src/common/uri.c b/src/common/uri.c
index 4af94072c..668e617d8 100644
--- 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 }
@@ -194,13 +197,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,