X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Furi.c;h=58ffcbcd66de518c8fba4ee4c470609af5ec8491;hp=712339a5fded2efce62d2475f00282e63c061534;hb=1b7c93cbef5f1c0497f65c9b48b3487e1f6c6034;hpb=60782118cd8cf7149567669688370b4b2a6c0419

diff --git a/src/common/uri.c b/src/common/uri.c
index 712339a5f..58ffcbcd6 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>
@@ -29,6 +29,9 @@
 
 #include "uri.h"
 
+#define LOOPBACK_ADDR_IPV4 "127.0.0.1"
+#define LOOPBACK_ADDR_IPV6 "::1"
+
 enum uri_proto_code {
 	P_NET, P_NET6, P_FILE, P_TCP, P_TCP6,
 };
@@ -68,7 +71,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.
  */
@@ -115,15 +117,44 @@ 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);
-		if (record == NULL) {
+		record = lttng_gethostbyname2(addr, af);
+		if (record) {
+			/* Translate IP to string */
+			if (!inet_ntop(af, record->h_addr_list[0], dst, size)) {
+				PERROR("inet_ntop");
+				goto error;
+			}
+		} else if (!strcmp(addr, "localhost") &&
+				(af == AF_INET || af == AF_INET6)) {
+			/*
+			 * Some systems may not have "localhost" defined in
+			 * accordance with IETF RFC 6761. According to this RFC,
+			 * applications may recognize "localhost" names as
+			 * special and resolve to the appropriate loopback
+			 * address.
+			 *
+			 * We choose to use the system name resolution API first
+			 * to honor its network configuration. If this fails, we
+			 * resolve to the appropriate loopback address. This is
+			 * done to accomodate systems which may want to start
+			 * tracing before their network configured.
+			 */
+			const char *loopback_addr = af == AF_INET ?
+					LOOPBACK_ADDR_IPV4 : LOOPBACK_ADDR_IPV6;
+			const size_t loopback_addr_len = af == AF_INET ?
+					sizeof(LOOPBACK_ADDR_IPV4) :
+					sizeof(LOOPBACK_ADDR_IPV6);
+
+			DBG2("Could not resolve localhost address, using fallback");
+			if (loopback_addr_len > size) {
+				ERR("Could not resolve localhost address; destination string is too short");
+				goto error;
+			}
+			strcpy(dst, loopback_addr);
+		} else {
 			/* At this point, the IP or the hostname is bad */
-			ERR("URI parse bad hostname %s for af %d", addr, af);
 			goto error;
 		}
-
-		/* Translate IP to string */
-		(void) inet_ntop(af, record->h_addr_list[0], dst, size);
 	} else {
 		if (size > 0) {
 			strncpy(dst, addr, size);
@@ -132,10 +163,10 @@ static int set_ip_address(const char *addr, int af, char *dst, size_t size)
 	}
 
 	DBG2("IP address resolved to %s", dst);
-
 	return 0;
 
 error:
+	ERR("URI parse bad hostname %s for af %d", addr, af);
 	return -1;
 }
 
@@ -201,7 +232,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);
 	}