X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Furi.c;h=fb61a5bbdc0c61138823fbae0fd143bffb328f65;hp=8d7cf9074beb02ab5f9981edd1f790dfd042070d;hb=000fa86f1276f62aa32cdb18f6556db1bdeee09b;hpb=bc89445574c5bef2a905f213c3a615ea559bd4c8

diff --git a/src/common/uri.c b/src/common/uri.c
index 8d7cf9074..fb61a5bbd 100644
--- a/src/common/uri.c
+++ b/src/common/uri.c
@@ -15,10 +15,10 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <arpa/inet.h>
-#include <netdb.h>
+#include <common/compat/netdb.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
@@ -45,8 +45,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 }
@@ -66,7 +68,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,7 +114,7 @@ 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);
+		record = lttng_gethostbyname2(addr, af);
 		if (record == NULL) {
 			/* At this point, the IP or the hostname is bad */
 			ERR("URI parse bad hostname %s for af %d", addr, af);
@@ -186,7 +187,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 +200,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);
 	}