X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient.c;h=71da9359b491a4053aea9ecfaa03a82df76bcc29;hp=095fc93bf719f7f34d8d839ab6f55f42d6dc030a;hb=25e44fc1e666fb333b3c53bcda90e44b0b74bf19;hpb=385651080cd88369ae4e71d8b80f5c0e4b952fd5

diff --git a/uclient.c b/uclient.c
index 095fc93..71da935 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,
@@ -12,8 +13,9 @@ static struct uclient_url *uclient_get_url(const char *url_str)
 	const struct uclient_backend *backend;
 	const char * const *prefix = NULL;
 	struct uclient_url *url;
-	char *url_buf, *next;
-	int i;
+	const char *location;
+	char *host_buf, *uri_buf, *auth_buf, *next;
+	int i, host_len;
 
 	for (i = 0; i < ARRAY_SIZE(backends); i++) {
 		int prefix_len = 0;
@@ -36,30 +38,40 @@ static struct uclient_url *uclient_get_url(const char *url_str)
 	if (!*prefix)
 		return NULL;
 
-	url = calloc_a(sizeof(*url), &url_buf, strlen(url_str) + 1);
-	url->backend = backend;
-	strcpy(url_buf, url_str);
-
-	next = strchr(url_buf, '/');
+	next = strchr(url_str, '/');
 	if (next) {
-		*next = 0;
-		url->location = next + 1;
+		location = next;
+		host_len = next - url_str;
 	} else {
-		url->location = "";
+		location = "/";
+		host_len = strlen(url_str);
 	}
 
-	url->host = url_buf;
-	next = strchr(url_buf, '@');
+	url = calloc_a(sizeof(*url),
+		&host_buf, host_len + 1,
+		&uri_buf, strlen(location) + 1,
+		&auth_buf, auth_str ? strlen(auth_str) + 1 : 0);
+
+	url->backend = backend;
+	url->location = strcpy(uri_buf, location);
+	url->prefix = prefix - backend->prefix;
+
+	url->host = strncpy(host_buf, url_str, host_len);
+
+	next = strchr(host_buf, '@');
 	if (next) {
 		*next = 0;
 		url->host = next + 1;
 
-		if (uclient_urldecode(url_buf, url_buf, false) < 0)
+		if (uclient_urldecode(host_buf, host_buf, false) < 0)
 			goto free;
 
-		url->auth = url_buf;
+		url->auth = host_buf;
 	}
 
+	if (!url->auth && auth_str)
+		url->auth = strcpy(auth_buf, auth_str);
+
 	/* Literal IPv6 address */
 	if (*url->host == '[') {
 		url->host++;
@@ -88,7 +100,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;
 
@@ -109,7 +121,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;
 
@@ -166,8 +178,8 @@ static void __uclient_backend_change_state(struct uloop_timeout *timeout)
 {
 	struct uclient *cl = container_of(timeout, struct uclient, timeout);
 
-	if (cl->error && cl->cb->error)
-		cl->cb->error(cl);
+	if (cl->error_code && cl->cb->error)
+		cl->cb->error(cl, cl->error_code);
 	else if (cl->eof && cl->cb->data_eof)
 		cl->cb->data_eof(cl);
 }
@@ -178,18 +190,18 @@ 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, int code)
 {
-	if (cl->error)
+	if (cl->error_code)
 		return;
 
-	cl->error = true;
+	cl->error_code = code;
 	uclient_backend_change_state(cl);
 }
 
 void __hidden uclient_backend_set_eof(struct uclient *cl)
 {
-	if (cl->eof || cl->error)
+	if (cl->eof || cl->error_code)
 		return;
 
 	cl->eof = true;
@@ -198,7 +210,7 @@ void __hidden uclient_backend_set_eof(struct uclient *cl)
 
 void __hidden uclient_backend_reset_state(struct uclient *cl)
 {
-	cl->error = false;
 	cl->eof = false;
+	cl->error_code = 0;
 	uloop_timeout_cancel(&cl->timeout);
 }