X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient-http.c;h=5e5f9961e20d6ffc56de980123f1e2d35862c53a;hp=eb69702fb287470d9abbe2b6d4a6679da48dea73;hb=c35d9db9362e095553f2c043b1a2bf195435bc09;hpb=19c7fb01ad48b884672b7d8d252d3c290b9e883c

diff --git a/uclient-http.c b/uclient-http.c
index eb69702..5e5f996 100644
--- a/uclient-http.c
+++ b/uclient-http.c
@@ -19,6 +19,7 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <stdint.h>
+#include <fcntl.h>
 
 #include <libubox/ustream.h>
 #include <libubox/ustream-ssl.h>
@@ -73,6 +74,7 @@ struct uclient_http {
 	struct ustream_ssl ussl;
 
 	struct uloop_timeout disconnect_t;
+	unsigned int seq;
 
 	bool ssl_require_validation;
 	bool ssl;
@@ -106,6 +108,8 @@ static const char * const uclient_http_prefix[] = {
 	[__PREFIX_MAX] = NULL
 };
 
+static int uclient_http_connect(struct uclient *cl);
+
 static int uclient_do_connect(struct uclient_http *uh, const char *port)
 {
 	socklen_t sl;
@@ -114,18 +118,18 @@ static int uclient_do_connect(struct uclient_http *uh, const char *port)
 	if (uh->uc.url->port)
 		port = uh->uc.url->port;
 
-	fd = usock(USOCK_TCP | USOCK_NONBLOCK, uh->uc.url->host, port);
+	memset(&uh->uc.remote_addr, 0, sizeof(uh->uc.remote_addr));
+
+	fd = usock_inet(USOCK_TCP, uh->uc.url->host, port, &uh->uc.remote_addr);
 	if (fd < 0)
 		return -1;
 
+	fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
 	ustream_fd_init(&uh->ufd, fd);
 
-	memset(&uh->uc.local_addr, 0, sizeof(uh->uc.local_addr));
-	memset(&uh->uc.remote_addr, 0, sizeof(uh->uc.remote_addr));
-
 	sl = sizeof(uh->uc.local_addr);
+	memset(&uh->uc.local_addr, 0, sl);
 	getsockname(fd, &uh->uc.local_addr.sa, &sl);
-	getpeername(fd, &uh->uc.remote_addr.sa, &sl);
 
 	return 0;
 }
@@ -188,6 +192,9 @@ static void uclient_notify_eof(struct uclient_http *uh)
 			return;
 	}
 
+	if (uh->content_length < 0 && uh->read_chunked >= 0)
+		uh->uc.data_eof = true;
+
 	uclient_backend_set_eof(&uh->uc);
 
 	if (uh->connection_close)
@@ -196,6 +203,7 @@ static void uclient_notify_eof(struct uclient_http *uh)
 
 static void uclient_http_reset_state(struct uclient_http *uh)
 {
+	uh->seq++;
 	uclient_backend_reset_state(&uh->uc);
 	uh->read_chunked = -1;
 	uh->content_length = -1;
@@ -210,6 +218,7 @@ static void uclient_http_reset_state(struct uclient_http *uh)
 
 static void uclient_http_init_request(struct uclient_http *uh)
 {
+	uh->seq++;
 	uclient_http_reset_state(uh);
 	blob_buf_init(&uh->meta, 0);
 }
@@ -538,6 +547,9 @@ uclient_http_send_headers(struct uclient_http *uh)
 	if (uh->state >= HTTP_STATE_HEADERS_SENT)
 		return;
 
+	if (uh->uc.proxy_url)
+		url = uh->uc.proxy_url;
+
 	ustream_printf(uh->us,
 		"%s %s HTTP/1.1\r\n"
 		"Host: %s\r\n",
@@ -545,7 +557,7 @@ uclient_http_send_headers(struct uclient_http *uh)
 		url->location, url->host);
 
 	blobmsg_for_each_attr(cur, uh->headers.head, rem)
-		ustream_printf(uh->us, "%s: %s\n", blobmsg_name(cur), (char *) blobmsg_data(cur));
+		ustream_printf(uh->us, "%s: %s\r\n", blobmsg_name(cur), (char *) blobmsg_data(cur));
 
 	if (uh->req_type == REQ_POST || uh->req_type == REQ_PUT)
 		ustream_printf(uh->us, "Transfer-Encoding: chunked\r\n");
@@ -560,6 +572,7 @@ uclient_http_send_headers(struct uclient_http *uh)
 static void uclient_http_headers_complete(struct uclient_http *uh)
 {
 	enum auth_type auth_type = uh->auth_type;
+	int seq = uh->uc.seq;
 
 	uh->state = HTTP_STATE_RECV_DATA;
 	uh->uc.meta = uh->meta.head;
@@ -567,7 +580,7 @@ static void uclient_http_headers_complete(struct uclient_http *uh)
 
 	if (auth_type == AUTH_TYPE_UNKNOWN && uh->uc.status_code == 401 &&
 	    (uh->req_type == REQ_HEAD || uh->req_type == REQ_GET)) {
-		uclient_http_init_request(uh);
+		uclient_http_connect(&uh->uc);
 		uclient_http_send_headers(uh);
 		uh->state = HTTP_STATE_REQUEST_DONE;
 		return;
@@ -576,7 +589,7 @@ static void uclient_http_headers_complete(struct uclient_http *uh)
 	if (uh->uc.cb->header_done)
 		uh->uc.cb->header_done(&uh->uc);
 
-	if (uh->eof)
+	if (uh->eof || seq != uh->uc.seq)
 		return;
 
 	if (uh->req_type == REQ_HEAD || uh->uc.status_code == 204) {
@@ -641,6 +654,7 @@ error:
 static void __uclient_notify_read(struct uclient_http *uh)
 {
 	struct uclient *uc = &uh->uc;
+	unsigned int seq = uh->seq;
 	char *data;
 	int len;
 
@@ -652,29 +666,37 @@ static void __uclient_notify_read(struct uclient_http *uh)
 		return;
 
 	if (uh->state < HTTP_STATE_RECV_DATA) {
-		char *sep;
+		char *sep, *next;
 		int cur_len;
 
 		do {
-			sep = strstr(data, "\r\n");
+			sep = strchr(data, '\n');
 			if (!sep)
 				break;
 
+			next = sep + 1;
+			if (sep > data && sep[-1] == '\r')
+				sep--;
+
 			/* Check for multi-line HTTP headers */
 			if (sep > data) {
-				if (!sep[2])
+				if (!*next)
 					return;
 
-				if (isspace(sep[2]) && sep[2] != '\r') {
+				if (isspace(*next) && *next != '\r' && *next != '\n') {
 					sep[0] = ' ';
-					sep[1] = ' ';
+					if (sep + 1 < next)
+						sep[1] = ' ';
 					continue;
 				}
 			}
 
 			*sep = 0;
-			cur_len = sep + 2 - data;
+			cur_len = next - data;
 			uclient_parse_http_line(uh, data);
+			if (seq != uh->seq)
+				return;
+
 			ustream_consume(uh->us, cur_len);
 			len -= cur_len;
 
@@ -726,6 +748,10 @@ static void uclient_notify_state(struct ustream *us)
 {
 	struct uclient_http *uh = container_of(us, struct uclient_http, ufd.stream);
 
+	if (uh->ufd.stream.write_error) {
+		uclient_http_error(uh, UCLIENT_ERROR_CONNECT);
+		return;
+	}
 	uclient_notify_eof(uh);
 }
 
@@ -820,6 +846,7 @@ static int uclient_setup_https(struct uclient_http *uh)
 	uh->ussl.notify_error = uclient_ssl_notify_error;
 	uh->ussl.notify_verify_error = uclient_ssl_notify_verify_error;
 	uh->ussl.notify_connected = uclient_ssl_notify_connected;
+	uh->ussl.server_name = uh->uc.url->host;
 	uh->ssl_ops->init(&uh->ussl, &uh->ufd.stream, uh->ssl_ctx, false);
 	uh->ssl_ops->set_peer_cn(&uh->ussl, uh->uc.url->host);
 
@@ -831,7 +858,7 @@ static int uclient_http_connect(struct uclient *cl)
 	struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
 	int ret;
 
-	if (!cl->eof || uh->disconnect)
+	if (!cl->eof || uh->disconnect || uh->connection_close)
 		uclient_http_disconnect(uh);
 
 	uclient_http_init_request(uh);
@@ -1044,7 +1071,7 @@ uclient_http_read(struct uclient *cl, char *buf, unsigned int len)
 	return len;
 }
 
-bool uclient_http_redirect(struct uclient *cl)
+int uclient_http_redirect(struct uclient *cl)
 {
 	struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
 	struct blobmsg_policy location = {
@@ -1076,7 +1103,9 @@ bool uclient_http_redirect(struct uclient *cl)
 
 	free(cl->url);
 	cl->url = url;
-	uclient_http_connect(cl);
+	if (uclient_http_connect(cl))
+		return -1;
+
 	uclient_http_request_done(cl);
 
 	return true;
@@ -1108,6 +1137,7 @@ const struct uclient_backend uclient_backend_http = {
 	.connect = uclient_http_connect,
 	.disconnect = uclient_http_request_disconnect,
 	.update_url = uclient_http_free_url_state,
+	.update_proxy_url = uclient_http_free_url_state,
 
 	.read = uclient_http_read,
 	.write = uclient_http_send_data,