X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Furl%2Furl.c;h=b74018ddd0f300f4d8ca7d2efffa3fc3451e85fe;hp=700f87cd936ed0d184cb75312f6cacac0c1739bf;hb=refs%2Ftags%2Fv1.10.1;hpb=f385e8cacbc574e213b0805a8d383373f29a8058

diff --git a/lib/url/url.c b/lib/url/url.c
index 700f87c..b74018d 100644
--- a/lib/url/url.c
+++ b/lib/url/url.c
@@ -20,7 +20,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 #include <assert.h>
 #include <string.h>
 
@@ -194,23 +193,39 @@ struct pb_url *pb_url_parse(void *ctx, const char *url_str)
 		path = strchr(p, '/');
 
 		if (!path) {
-			pb_log("%s: parse path failed '%s'\n", __func__ , p);
+			pb_log_fn("parse path failed '%s'\n" , p);
 			goto fail;
 		}
 
-		col = strchr(p, ':');
+		col = strrchr(p, ':');
+		if (col <= p)
+			col = NULL;
+		if (col && strchr(col , ']')) {
+			/*
+			 * This is likely an IPv6 address with no port.
+			 * See https://www.ietf.org/rfc/rfc2732.txt
+			 */
+			col = NULL;
+		}
 
 		if (col) {
 			len = path - col - 1;
 			url->port = len ? talloc_strndup(url, col + 1, len)
 				: NULL;
 			len = col - p;
-			url->host = len ? talloc_strndup(url, p, len) : NULL;
 		} else {
 			url->port = NULL;
-			url->host = talloc_strndup(url, p, path - p);
+			len = path - p;
 		}
 
+		if (p[0] == '[' && p[len - 1] == ']')
+			/* IPv6 */
+			url->host = talloc_strndup(url, p + 1, len - 2);
+		else
+			/* IPv4 */
+			url->host = talloc_strndup(url, p, len);
+
+
 		/* remove multiple leading slashes */
 		for (; *path && *(path+1) == '/'; path++)
 			;
@@ -232,13 +247,39 @@ bool is_url(const char *str)
 	return strstr(str, "://") != NULL;
 }
 
+int addr_scheme(const char *address)
+{
+	uint8_t buf[sizeof(struct in6_addr)];
+	int rc;
+
+	rc = inet_pton(AF_INET, address , buf);
+	if (rc == 1)
+		return AF_INET;
+	rc = inet_pton(AF_INET6, address , buf);
+	if (rc == 1)
+		return AF_INET6;
+
+	return 0;
+}
+
 char *pb_url_to_string(struct pb_url *url)
 {
 	const struct pb_scheme_info *scheme = pb_url_scheme_info(url->scheme);
+	char *str, *port;
 	assert(scheme);
 
-	return talloc_asprintf(url, "%s://%s%s", scheme->str,
-			scheme->has_host ? url->host : "", url->path);
+	port = url->port ? talloc_asprintf(url, ":%s", url->port) : NULL;
+
+	if (scheme->has_host && addr_scheme(url->host) == AF_INET6)
+		str = talloc_asprintf(url, "%s://[%s]%s%s", scheme->str,
+				url->host, port ?: "", url->path);
+	else
+		str = talloc_asprintf(url, "%s://%s%s%s", scheme->str,
+				scheme->has_host ? url->host : "",
+				port ?: "", url->path);
+
+	talloc_free(port);
+	return str;
 }
 
 static void pb_url_update_full(struct pb_url *url)
@@ -247,7 +288,7 @@ static void pb_url_update_full(struct pb_url *url)
 	url->full = pb_url_to_string(url);
 }
 
-static struct pb_url *pb_url_copy(void *ctx, const struct pb_url *url)
+struct pb_url *pb_url_copy(void *ctx, const struct pb_url *url)
 {
 	struct pb_url *new_url;