X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient.c;h=e7213a1002ecd7b1914104ad74d7fb294239338e;hp=4125dc238c42cac8056675c3e2eb248f4d090f8b;hb=8102f4c0c3923aecd078c1bd15f6b1156b4f5f4d;hpb=5f2e60972941c1ca1a6fa572b39e18cbc58137d9

diff --git a/uclient.c b/uclient.c
index 4125dc2..e7213a1 100644
--- a/uclient.c
+++ b/uclient.c
@@ -3,7 +3,8 @@
 #include "uclient-utils.h"
 #include "uclient-backend.h"
 
-static struct uclient_url *uclient_get_url(const char *url_str)
+struct uclient_url * __hidden
+uclient_get_url(const char *url_str, const char *auth_str)
 {
 	static const struct uclient_backend *backends[] = {
 		&uclient_backend_http,
@@ -13,7 +14,7 @@ static struct uclient_url *uclient_get_url(const char *url_str)
 	const char * const *prefix = NULL;
 	struct uclient_url *url;
 	const char *location;
-	char *host_buf, *uri_buf, *next;
+	char *host_buf, *uri_buf, *auth_buf, *next;
 	int i, host_len;
 
 	for (i = 0; i < ARRAY_SIZE(backends); i++) {
@@ -48,7 +49,8 @@ static struct uclient_url *uclient_get_url(const char *url_str)
 
 	url = calloc_a(sizeof(*url),
 		&host_buf, host_len + 1,
-		&uri_buf, strlen(location) + 1);
+		&uri_buf, strlen(location) + 1,
+		&auth_buf, auth_str ? strlen(auth_str) + 1 : 0);
 
 	url->backend = backend;
 	url->location = strcpy(uri_buf, location);
@@ -66,6 +68,9 @@ static struct uclient_url *uclient_get_url(const char *url_str)
 		url->auth = host_buf;
 	}
 
+	if (!url->auth && auth_str)
+		url->auth = strcpy(auth_buf, auth_str);
+
 	/* Literal IPv6 address */
 	if (*url->host == '[') {
 		url->host++;
@@ -94,7 +99,7 @@ struct uclient *uclient_new(const char *url_str, const struct uclient_cb *cb)
 	struct uclient *cl;
 	struct uclient_url *url;
 
-	url = uclient_get_url(url_str);
+	url = uclient_get_url(url_str, NULL);
 	if (!url)
 		return NULL;
 
@@ -115,7 +120,7 @@ int uclient_connect_url(struct uclient *cl, const char *url_str)
 	const struct uclient_backend *backend = cl->backend;
 
 	if (url_str) {
-		url = uclient_get_url(url_str);
+		url = uclient_get_url(url_str, NULL);
 		if (!url)
 			return -1;
 
@@ -184,7 +189,7 @@ static void uclient_backend_change_state(struct uclient *cl)
 	uloop_timeout_set(&cl->timeout, 1);
 }
 
-void uclient_backend_set_error(struct uclient *cl)
+void __hidden uclient_backend_set_error(struct uclient *cl)
 {
 	if (cl->error)
 		return;