X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=uclient-http.c;h=c6336a68705afc09fa58f079057e55e51e479679;hb=2e0918c7e0612449024caaaa8d44fb2d7a33f5f3;hp=e58cf274b3a6cef5b06929462c7638f3d648afa1;hpb=07b4860975bd919fc8a8ce75d14ca8216eab70aa;p=project%2Fuclient.git

diff --git a/uclient-http.c b/uclient-http.c
index e58cf27..c6336a6 100644
--- a/uclient-http.c
+++ b/uclient-http.c
@@ -15,6 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include <sys/socket.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <unistd.h>
@@ -90,6 +91,8 @@ struct uclient_http {
 	long read_chunked;
 	long content_length;
 
+	int usock_flags;
+
 	uint32_t nc;
 
 	struct blob_buf headers;
@@ -120,7 +123,9 @@ static int uclient_do_connect(struct uclient_http *uh, const char *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);
+	fd = usock_inet_timeout(USOCK_TCP | USOCK_NONBLOCK | uh->usock_flags,
+				uh->uc.url->host, port, &uh->uc.remote_addr,
+				uh->uc.timeout_msecs);
 	if (fd < 0)
 		return -1;
 
@@ -192,6 +197,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)
@@ -1126,6 +1134,28 @@ int uclient_http_set_ssl_ctx(struct uclient *cl, const struct ustream_ssl_ops *o
 	return 0;
 }
 
+int uclient_http_set_address_family(struct uclient *cl, int af)
+{
+	struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
+
+	if (cl->backend != &uclient_backend_http)
+		return -1;
+
+	switch (af) {
+	case AF_INET:
+		uh->usock_flags = USOCK_IPV4ONLY;
+		break;
+	case AF_INET6:
+		uh->usock_flags = USOCK_IPV6ONLY;
+		break;
+	default:
+		uh->usock_flags = 0;
+		break;
+	}
+
+	return 0;
+}
+
 const struct uclient_backend uclient_backend_http = {
 	.prefix = uclient_http_prefix,